From: Matt Corallo Date: Tue, 30 Aug 2022 04:03:47 +0000 (+0000) Subject: Drop honggfuzz `arbitrary` dependency to meet MSRV X-Git-Tag: v0.0.111~22^2 X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=refs%2Fheads%2F2022-08-fuzz-msrv;p=rust-lightning Drop honggfuzz `arbitrary` dependency to meet MSRV --- diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index be37fb83c..95308e1bf 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -22,7 +22,7 @@ lightning = { path = "../lightning", features = ["regex"] } lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" } bitcoin = { version = "0.29.0", features = ["secp-lowmemory"] } hex = "0.3" -honggfuzz = { version = "0.5", optional = true } +honggfuzz = { version = "0.5", optional = true, default-features = false } libfuzzer-sys = { version = "0.4", optional = true } [build-dependencies] diff --git a/fuzz/ci-fuzz.sh b/fuzz/ci-fuzz.sh index 6f0074b6a..969505ca8 100755 --- a/fuzz/ci-fuzz.sh +++ b/fuzz/ci-fuzz.sh @@ -13,7 +13,7 @@ rm *_target.rs [ "$(git diff)" != "" ] && exit 1 popd -cargo install --color always --force honggfuzz +cargo install --color always --force honggfuzz --no-default-features sed -i 's/lto = true//' Cargo.toml HFUZZ_BUILD_ARGS="--features honggfuzz_fuzz" cargo --color always hfuzz build for TARGET in src/bin/*.rs; do diff --git a/lightning-invoice/fuzz/Cargo.toml b/lightning-invoice/fuzz/Cargo.toml index 833606c1a..6f79757c2 100644 --- a/lightning-invoice/fuzz/Cargo.toml +++ b/lightning-invoice/fuzz/Cargo.toml @@ -12,7 +12,7 @@ afl_fuzz = ["afl"] honggfuzz_fuzz = ["honggfuzz"] [dependencies] -honggfuzz = { version = "0.5", optional = true } +honggfuzz = { version = "0.5", optional = true, default-features = false } afl = { version = "0.4", optional = true } lightning-invoice = { path = ".." } lightning = { path = "../../lightning", features = ["regex"] } diff --git a/lightning-invoice/fuzz/ci-fuzz.sh b/lightning-invoice/fuzz/ci-fuzz.sh index ae85ea913..db1b9eb38 100755 --- a/lightning-invoice/fuzz/ci-fuzz.sh +++ b/lightning-invoice/fuzz/ci-fuzz.sh @@ -1,6 +1,6 @@ #!/bin/bash set -e -cargo install --force honggfuzz +cargo install --force honggfuzz --no-default-features for TARGET in fuzz_targets/*; do FILENAME=$(basename $TARGET) FILE="${FILENAME%.*}"