From ddb6dd520ec173f199d7c0fc0e9baa1abd00e4f7 Mon Sep 17 00:00:00 2001
From: "Jamil Lambert, PhD" <Jamil.Lambert@proton.me>
Date: Fri, 7 Mar 2025 15:44:50 +0000
Subject: [PATCH] Move module out of fuzz_target directory

The new module `fuzz_utils` in the `fuzz_targets/` directory causes
`verify-execution` to fail.

Move the module to the `src/` directory. Create a `lib.rs` file.
---
 fuzz/fuzz_targets/bitcoin/deserialize_psbt.rs    | 3 +--
 fuzz/fuzz_targets/bitcoin/deserialize_script.rs  | 3 +--
 fuzz/{fuzz_targets/bitcoin => src}/fuzz_utils.rs | 4 ++++
 fuzz/src/lib.rs                                  | 5 +++++
 4 files changed, 11 insertions(+), 4 deletions(-)
 rename fuzz/{fuzz_targets/bitcoin => src}/fuzz_utils.rs (90%)
 create mode 100644 fuzz/src/lib.rs

diff --git a/fuzz/fuzz_targets/bitcoin/deserialize_psbt.rs b/fuzz/fuzz_targets/bitcoin/deserialize_psbt.rs
index b3fe54bbd..043d19596 100644
--- a/fuzz/fuzz_targets/bitcoin/deserialize_psbt.rs
+++ b/fuzz/fuzz_targets/bitcoin/deserialize_psbt.rs
@@ -1,7 +1,6 @@
 use honggfuzz::fuzz;
 
-mod fuzz_utils;
-use fuzz_utils::consume_random_bytes;
+use bitcoin_fuzz::fuzz_utils::consume_random_bytes;
 
 fn do_test(data: &[u8]) {
     let mut new_data = data;
diff --git a/fuzz/fuzz_targets/bitcoin/deserialize_script.rs b/fuzz/fuzz_targets/bitcoin/deserialize_script.rs
index e7c1191b4..0968b64f0 100644
--- a/fuzz/fuzz_targets/bitcoin/deserialize_script.rs
+++ b/fuzz/fuzz_targets/bitcoin/deserialize_script.rs
@@ -4,8 +4,7 @@ use bitcoin::script::{self, ScriptExt as _};
 use bitcoin::{FeeRate, Network};
 use honggfuzz::fuzz;
 
-mod fuzz_utils;
-use fuzz_utils::{consume_random_bytes, consume_u64};
+use bitcoin_fuzz::fuzz_utils::{consume_random_bytes, consume_u64};
 
 fn do_test(data: &[u8]) {
     let mut new_data = data;
diff --git a/fuzz/fuzz_targets/bitcoin/fuzz_utils.rs b/fuzz/src/fuzz_utils.rs
similarity index 90%
rename from fuzz/fuzz_targets/bitcoin/fuzz_utils.rs
rename to fuzz/src/fuzz_utils.rs
index aeaa11ae2..8a072db98 100644
--- a/fuzz/fuzz_targets/bitcoin/fuzz_utils.rs
+++ b/fuzz/src/fuzz_utils.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: CC0-1.0
+
+//! Helper functions for fuzzing.
+
 pub fn consume_random_bytes<'a>(data: &mut &'a [u8]) -> &'a [u8] {
     if data.is_empty() {
         return &[];
diff --git a/fuzz/src/lib.rs b/fuzz/src/lib.rs
new file mode 100644
index 000000000..1be440fab
--- /dev/null
+++ b/fuzz/src/lib.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: CC0-1.0
+
+//! # Fuzzing
+
+pub mod fuzz_utils;