update fuzz generator

Author: xdustinface

.github/workflows/fuzz.yml

@@ -23,7 +23,6 @@ jobs:
       fail-fast: false
       matrix:
         fuzz_target: [
-          dash_outpoint_string,
           dash_deserialize_amount,
           # TODO fix the inputs placed in fuzz/hfuzz_input/deserialize_transaction/input
 #          dash_deserialize_transaction,
@@ -33,15 +32,16 @@ jobs:
 #          dash_deserialize_prefilled_transaction,
           dash_deserialize_witness,
 #          dash_deserialize_psbt,
-          dash_deserialize_block,
+          dash_outpoint_string,
           dash_deserialize_script,
+          dash_deserialize_block,
+          hashes_sha1,
+          hashes_sha256,
+          hashes_sha512,
           hashes_json,
           hashes_cbor,
-          hashes_sha256,
           hashes_ripemd160,
           hashes_sha512_256,
-          hashes_sha512,
-          hashes_sha1,
         ]
     steps:
       - name: Install test dependencies

fuzz/Cargo.toml

@@ -28,17 +28,13 @@ serde_json = "1.0"
 serde_cbor = "0.11"
 
 [[bin]]
-name = "dash_outpoint_string"
-path = "fuzz_targets/dash/outpoint_string.rs"
+name = "dash_deserialize_prefilled_transaction"
+path = "fuzz_targets/dash/deserialize_prefilled_transaction.rs"
 
 [[bin]]
 name = "dash_deserialize_amount"
 path = "fuzz_targets/dash/deserialize_amount.rs"
 
-[[bin]]
-name = "dash_deserialize_transaction"
-path = "fuzz_targets/dash/deserialize_transaction.rs"
-
 [[bin]]
 name = "dash_deser_net_msg"
 path = "fuzz_targets/dash/deser_net_msg.rs"
@@ -51,25 +47,41 @@ path = "fuzz_targets/dash/deserialize_address.rs"
 name = "dash_script_bytes_to_asm_fmt"
 path = "fuzz_targets/dash/script_bytes_to_asm_fmt.rs"
 
-[[bin]]
-name = "dash_deserialize_prefilled_transaction"
-path = "fuzz_targets/dash/deserialize_prefilled_transaction.rs"
-
 [[bin]]
 name = "dash_deserialize_witness"
 path = "fuzz_targets/dash/deserialize_witness.rs"
 
+[[bin]]
+name = "dash_outpoint_string"
+path = "fuzz_targets/dash/outpoint_string.rs"
+
+[[bin]]
+name = "dash_deserialize_transaction"
+path = "fuzz_targets/dash/deserialize_transaction.rs"
+
 [[bin]]
 name = "dash_deserialize_psbt"
 path = "fuzz_targets/dash/deserialize_psbt.rs"
 
+[[bin]]
+name = "dash_deserialize_script"
+path = "fuzz_targets/dash/deserialize_script.rs"
+
 [[bin]]
 name = "dash_deserialize_block"
 path = "fuzz_targets/dash/deserialize_block.rs"
 
 [[bin]]
-name = "dash_deserialize_script"
-path = "fuzz_targets/dash/deserialize_script.rs"
+name = "hashes_sha1"
+path = "fuzz_targets/hashes/sha1.rs"
+
+[[bin]]
+name = "hashes_sha256"
+path = "fuzz_targets/hashes/sha256.rs"
+
+[[bin]]
+name = "hashes_sha512"
+path = "fuzz_targets/hashes/sha512.rs"
 
 [[bin]]
 name = "hashes_json"
@@ -79,22 +91,10 @@ path = "fuzz_targets/hashes/json.rs"
 name = "hashes_cbor"
 path = "fuzz_targets/hashes/cbor.rs"
 
-[[bin]]
-name = "hashes_sha256"
-path = "fuzz_targets/hashes/sha256.rs"
-
 [[bin]]
 name = "hashes_ripemd160"
 path = "fuzz_targets/hashes/ripemd160.rs"
 
 [[bin]]
 name = "hashes_sha512_256"
 path = "fuzz_targets/hashes/sha512_256.rs"
-
-[[bin]]
-name = "hashes_sha512"
-path = "fuzz_targets/hashes/sha512.rs"
-
-[[bin]]
-name = "hashes_sha1"
-path = "fuzz_targets/hashes/sha1.rs"

fuzz/fuzz-util.sh

@@ -2,13 +2,19 @@
 
 REPO_DIR=$(git rev-parse --show-toplevel)
 
-listTargetFiles() {
+listAllTargetFiles() {
   pushd "$REPO_DIR/fuzz" > /dev/null || exit 1
-  find fuzz_targets -type f -name "*.rs" \
-    | grep -v 'deserialize_transaction\|deserialize_prefilled_transaction\|deserialize_psbt'
+  # List dash targets first, then hashes
+  find fuzz_targets/dash -type f -name "*.rs" 2>/dev/null
+  find fuzz_targets/hashes -type f -name "*.rs" 2>/dev/null
   popd > /dev/null || exit 1
 }
 
+listTargetFiles() {
+  # Exclude targets that don't work in CI
+  listAllTargetFiles | grep -v 'deserialize_transaction\|deserialize_prefilled_transaction\|deserialize_psbt'
+}
+
 targetFileToName() {
   echo "$1" \
     | sed 's/^fuzz_targets\///' \

fuzz/generate-files.sh

@@ -39,7 +39,7 @@ serde_json = "1.0"
 serde_cbor = "0.11"
 EOF
 
-for targetFile in $(listTargetFiles); do
+for targetFile in $(listAllTargetFiles); do
     targetName=$(targetFileToName "$targetFile")
     cat >> "$REPO_DIR/fuzz/Cargo.toml" <<EOF