fuzz: remove existing CI; run fuzz/generate-files.sh to make new one

Author: apoelstra

.github/workflows/fuzz.yml

@@ -0,0 +1,63 @@
+# Automatically generated by fuzz/generate-files.sh
+name: Fuzz
+
+on:
+  push:
+    branches:
+      - master
+      - 'test-ci/**'
+  pull_request:
+
+jobs:
+  fuzz:
+    if: ${{ !github.event.act }}
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        fuzz_target: [
+roundtrip_miniscript_str,
+roundtrip_miniscript_script,
+parse_descriptor,
+roundtrip_semantic,
+parse_descriptor_secret,
+roundtrip_descriptor,
+roundtrip_concrete,
+compile_descriptor,
+        ]
+    steps:
+      - name: Install test dependencies
+        run: sudo apt-get update -y && sudo apt-get install -y binutils-dev libunwind8-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc libiberty-dev
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        id: cache-fuzz
+        with:
+          path: |
+            ~/.cargo/bin
+            fuzz/target
+            target
+          key: cache-${{ matrix.target }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: 1.58
+          override: true
+          profile: minimal
+      - name: fuzz
+        run: cd fuzz && ./fuzz.sh "${{ matrix.fuzz_target }}"
+      - run: echo "${{ matrix.fuzz_target }}" >executed_${{ matrix.fuzz_target }}
+      - uses: actions/upload-artifact@v2
+        with:
+          name: executed_${{ matrix.fuzz_target }}
+          path: executed_${{ matrix.fuzz_target }}
+
+  verify-execution:
+    if: ${{ !github.event.act }}
+    needs: fuzz
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/download-artifact@v2
+      - name: Display structure of downloaded files
+        run: ls -R
+      - run: find executed_* -type f -exec cat {} + | sort > executed
+      - run: source ./fuzz/fuzz-util.sh && listTargetNames | sort | diff - executed

.github/workflows/rust.yml

@@ -3,25 +3,6 @@ on: [push, pull_request]
 name: Continuous integration
 
 jobs:
-  Fuzz:
-    name: Fuzz
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Crate
-        uses: actions/checkout@v2
-      - name: Install hongfuzz dependencies
-        run: sudo apt update && sudo apt install build-essential binutils-dev libunwind-dev libblocksruntime-dev liblzma-dev
-      - name: Checkout Toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: 1.58.0
-          override: true
-      - name: Running fuzzer
-        env:
-          DO_FUZZ: true
-        run: ./contrib/test.sh
-
   Nightly:
     name: Nightly - Bench + Docs + Fmt
     runs-on: ubuntu-latest

contrib/test.sh

@@ -26,17 +26,6 @@ if cargo --version | grep "1\.47\.0"; then
     cargo update -p serde --precise 1.0.156
 fi
 
-# Fuzz if told to
-if [ "$DO_FUZZ" = true ]
-then
-    cd fuzz
-    cargo test --verbose
-    ./travis-fuzz.sh
-
-    # Exit out of the fuzzer, do not run other tests.
-    exit 0
-fi
-
 # Test bitcoind integration tests if told to (this only works with the stable toolchain)
 if [ "$DO_BITCOIND_TESTS" = true ]; then
     cd bitcoind-tests

fuzz/Cargo.toml

@@ -1,50 +1,47 @@
 [package]
 name = "descriptor-fuzz"
+edition = "2018"
 version = "0.0.1"
-authors = ["Automatically generated"]
+authors = ["Generated by fuzz/generate-files.sh"]
 publish = false
 
 [package.metadata]
 cargo-fuzz = true
 
-[features]
-afl_fuzz = ["afl"]
-honggfuzz_fuzz = ["honggfuzz"]
-
 [dependencies]
-honggfuzz = { version = "0.5.55", default-features = false, optional = true }
-afl = { version = "0.8", optional = true }
-regex = { version = "1.4"}
-miniscript = { path = "..", features = ["compiler"] }
+honggfuzz = { version = "0.5.55", default-features = false }
+miniscript = { path = "..", features = [ "compiler" ] }
+
+regex = "1.4"
 
 [[bin]]
-name = "roundtrip_descriptor"
-path = "fuzz_targets/roundtrip_descriptor.rs"
+name = "roundtrip_miniscript_str"
+path = "fuzz_targets/roundtrip_miniscript_str.rs"
 
 [[bin]]
 name = "roundtrip_miniscript_script"
 path = "fuzz_targets/roundtrip_miniscript_script.rs"
 
 [[bin]]
-name = "roundtrip_miniscript_str"
-path = "fuzz_targets/roundtrip_miniscript_str.rs"
-
-[[bin]]
-name = "roundtrip_concrete"
-path = "fuzz_targets/roundtrip_concrete.rs"
+name = "parse_descriptor"
+path = "fuzz_targets/parse_descriptor.rs"
 
 [[bin]]
 name = "roundtrip_semantic"
 path = "fuzz_targets/roundtrip_semantic.rs"
 
 [[bin]]
-name = "compile_descriptor"
-path = "fuzz_targets/compile_descriptor.rs"
+name = "parse_descriptor_secret"
+path = "fuzz_targets/parse_descriptor_secret.rs"
 
 [[bin]]
-name = "parse_descriptor"
-path = "fuzz_targets/parse_descriptor.rs"
+name = "roundtrip_descriptor"
+path = "fuzz_targets/roundtrip_descriptor.rs"
 
 [[bin]]
-name = "parse_descriptor_secret"
-path = "fuzz_targets/parse_descriptor_secret.rs"
+name = "roundtrip_concrete"
+path = "fuzz_targets/roundtrip_concrete.rs"
+
+[[bin]]
+name = "compile_descriptor"
+path = "fuzz_targets/compile_descriptor.rs"