Reduce CI fuzz iterations as we're now timing out

.github/workflows/build.yml

@@ -262,11 +262,12 @@ jobs:
           sudo apt-get -y install build-essential binutils-dev libunwind-dev
       - name: Pin the regex dependency
         run: |
-          cd fuzz && cargo update -p regex --precise "1.9.6" --verbose && cd ..
+          cd fuzz && cargo update -p regex --precise "1.9.6" --verbose
+          cd write-seeds && cargo update -p regex --precise "1.9.6" --verbose
       - name: Sanity check fuzz targets on Rust ${{ env.TOOLCHAIN }}
         run: |
           cd fuzz
-          RUSTFLAGS="--cfg=fuzzing --cfg=secp256k1_fuzz --cfg=hashes_fuzz" cargo test --verbose --color always
+          RUSTFLAGS="--cfg=fuzzing --cfg=secp256k1_fuzz --cfg=hashes_fuzz" cargo test --verbose --color always --lib --bins
           cargo clean
       - name: Run fuzzers
         run: cd fuzz && ./ci-fuzz.sh && cd ..

fuzz/ci-fuzz.sh

@@ -13,10 +13,19 @@ rm *_target.rs
 [ "$(git diff)" != "" ] && exit 1
 popd
 
+export RUSTFLAGS="--cfg=secp256k1_fuzz --cfg=hashes_fuzz"
+
+mkdir -p hfuzz_workspace/full_stack_target/input
+pushd write-seeds
+RUSTFLAGS="$RUSTFLAGS --cfg=fuzzing" cargo run ../hfuzz_workspace/full_stack_target/input
+popd
+
 cargo install --color always --force honggfuzz --no-default-features
+# Because we're fuzzing relatively few iterations, the maximum possible
+# compiler optimizations aren't necessary, so switch to defaults.
 sed -i 's/lto = true//' Cargo.toml
+sed -i 's/codegen-units = 1//' Cargo.toml
 
-export RUSTFLAGS="--cfg=secp256k1_fuzz --cfg=hashes_fuzz"
 export HFUZZ_BUILD_ARGS="--features honggfuzz_fuzz"
 
 cargo --color always hfuzz build
@@ -25,11 +34,13 @@ for TARGET in src/bin/*.rs; do
 	FILE="${FILENAME%.*}"
 	HFUZZ_RUN_ARGS="--exit_upon_crash -v -n2"
 	if [ "$FILE" = "chanmon_consistency_target" ]; then
-		HFUZZ_RUN_ARGS="$HFUZZ_RUN_ARGS -F 64 -N100000"
-	elif [ "$FILE" = "full_stack_target" ]; then
-		HFUZZ_RUN_ARGS="$HFUZZ_RUN_ARGS -t0 -N1000000"
+		HFUZZ_RUN_ARGS="$HFUZZ_RUN_ARGS -F 64 -N5000"
+	elif [ "$FILE" = "process_network_graph_target" -o "$FILE" = "full_stack_target" -o "$FILE" = "router_target" ]; then
+		HFUZZ_RUN_ARGS="$HFUZZ_RUN_ARGS -N50000"
+	elif [ "$FILE" = "indexedmap_target" ]; then
+		HFUZZ_RUN_ARGS="$HFUZZ_RUN_ARGS -N500000"
 	else
-		HFUZZ_RUN_ARGS="$HFUZZ_RUN_ARGS -N1000000"
+		HFUZZ_RUN_ARGS="$HFUZZ_RUN_ARGS -N2500000"
 	fi
 	export HFUZZ_RUN_ARGS
 	cargo --color always hfuzz run $FILE

fuzz/src/lib.rs

@@ -11,6 +11,15 @@ extern crate bitcoin;
 extern crate lightning;
 extern crate lightning_rapid_gossip_sync;
 
+#[cfg(not(fuzzing))]
+compile_error!("Fuzz targets need cfg=fuzzing");
+
+#[cfg(not(hashes_fuzz))]
+compile_error!("Fuzz targets need cfg=hashes_fuzz");
+
+#[cfg(not(secp256k1_fuzz))]
+compile_error!("Fuzz targets need cfg=secp256k1_fuzz");
+
 pub mod utils;
 
 pub mod base32;

fuzz/write-seeds/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "lightning-fuzz-write-seeds"
+version = "0.0.1"
+authors = ["Automatically generated"]
+publish = false
+edition = "2021"
+
+[features]
+
+[dependencies]
+lightning-fuzz = { path = "../" }
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]

fuzz/write-seeds/src/main.rs

@@ -0,0 +1,6 @@
+fn main() {
+	let mut iter = std::env::args();
+	iter.next().unwrap(); // program name
+	let path = iter.next().expect("Requires a path as the first argument");
+	lightning_fuzz::full_stack::write_fst_seeds(&path);
+}

lightning/src/routing/gossip.rs

@@ -1786,7 +1786,7 @@ where
 	}
 
 	fn test_node_counter_consistency(&self) {
-		#[cfg(test)]
+		#[cfg(any(test, fuzzing))]
 		{
 			let channels = self.channels.read().unwrap();
 			let nodes = self.nodes.read().unwrap();