From 2294480e8104c87473829fe55a71024908f1c0b6 Mon Sep 17 00:00:00 2001 From: Joost Jager Date: Thu, 30 Apr 2026 15:52:11 +0200 Subject: [PATCH] Check fuzz workspace formatting in CI Extend the rustfmt CI job to check the fuzz workspace. This covers fuzz alongside the root workspace and lightning-tests. --- .github/workflows/build.yml | 2 ++ fuzz/src/chanmon_consistency.rs | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d6a5deda322..1c34d8b3425 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -305,6 +305,8 @@ jobs: run: cargo fmt --check - name: Run rustfmt checks on lightning-tests run: cd lightning-tests && cargo fmt --check + - name: Run rustfmt checks on fuzz + run: cd fuzz && cargo fmt --check tor-connect: runs-on: ubuntu-latest env: diff --git a/fuzz/src/chanmon_consistency.rs b/fuzz/src/chanmon_consistency.rs index 655fb76200b..d678d97918f 100644 --- a/fuzz/src/chanmon_consistency.rs +++ b/fuzz/src/chanmon_consistency.rs @@ -208,9 +208,7 @@ impl ChainState { fn is_outpoint_spent(&self, outpoint: &bitcoin::OutPoint) -> bool { self.blocks.iter().any(|(_, txs)| { - txs.iter().any(|tx| { - tx.input.iter().any(|input| input.previous_output == *outpoint) - }) + txs.iter().any(|tx| tx.input.iter().any(|input| input.previous_output == *outpoint)) }) } @@ -1027,7 +1025,8 @@ pub fn do_test(data: &[u8], out: Out) { } let network = Network::Bitcoin; let best_block_timestamp = genesis_block(network).header.time; - let params = ChainParameters { network, best_block: BlockLocator::from_network(network) }; + let params = + ChainParameters { network, best_block: BlockLocator::from_network(network) }; ( ChannelManager::new( $fee_estimator.clone(), @@ -1142,8 +1141,8 @@ pub fn do_test(data: &[u8], out: Out) { channel_monitors: monitor_refs, }; - let manager = - <(BlockLocator, ChanMan)>::read(&mut &ser[..], read_args).expect("Failed to read manager"); + let manager = <(BlockLocator, ChanMan)>::read(&mut &ser[..], read_args) + .expect("Failed to read manager"); let res = (manager.1, chain_monitor.clone()); for (channel_id, mon) in monitors.drain() { assert_eq!( @@ -2106,7 +2105,8 @@ pub fn do_test(data: &[u8], out: Out) { }, events::Event::SpliceFailed { .. } => {}, events::Event::DiscardFunding { - funding_info: events::FundingInfo::Contribution { .. } + funding_info: + events::FundingInfo::Contribution { .. } | events::FundingInfo::Tx { .. }, .. } => {},