Skip to content

Commit 0c7e6e7

Browse files
authored
Merge pull request #4582 from joostjager/fmt-fuzz
Check fuzz workspace formatting in CI
2 parents 42e198c + 2294480 commit 0c7e6e7

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,8 @@ jobs:
305305
run: cargo fmt --check
306306
- name: Run rustfmt checks on lightning-tests
307307
run: cd lightning-tests && cargo fmt --check
308+
- name: Run rustfmt checks on fuzz
309+
run: cd fuzz && cargo fmt --check
308310
tor-connect:
309311
runs-on: ubuntu-latest
310312
env:

fuzz/src/chanmon_consistency.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,7 @@ impl ChainState {
208208

209209
fn is_outpoint_spent(&self, outpoint: &bitcoin::OutPoint) -> bool {
210210
self.blocks.iter().any(|(_, txs)| {
211-
txs.iter().any(|tx| {
212-
tx.input.iter().any(|input| input.previous_output == *outpoint)
213-
})
211+
txs.iter().any(|tx| tx.input.iter().any(|input| input.previous_output == *outpoint))
214212
})
215213
}
216214

@@ -1027,7 +1025,8 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
10271025
}
10281026
let network = Network::Bitcoin;
10291027
let best_block_timestamp = genesis_block(network).header.time;
1030-
let params = ChainParameters { network, best_block: BlockLocator::from_network(network) };
1028+
let params =
1029+
ChainParameters { network, best_block: BlockLocator::from_network(network) };
10311030
(
10321031
ChannelManager::new(
10331032
$fee_estimator.clone(),
@@ -1142,8 +1141,8 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
11421141
channel_monitors: monitor_refs,
11431142
};
11441143

1145-
let manager =
1146-
<(BlockLocator, ChanMan)>::read(&mut &ser[..], read_args).expect("Failed to read manager");
1144+
let manager = <(BlockLocator, ChanMan)>::read(&mut &ser[..], read_args)
1145+
.expect("Failed to read manager");
11471146
let res = (manager.1, chain_monitor.clone());
11481147
for (channel_id, mon) in monitors.drain() {
11491148
assert_eq!(
@@ -2106,7 +2105,8 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
21062105
},
21072106
events::Event::SpliceFailed { .. } => {},
21082107
events::Event::DiscardFunding {
2109-
funding_info: events::FundingInfo::Contribution { .. }
2108+
funding_info:
2109+
events::FundingInfo::Contribution { .. }
21102110
| events::FundingInfo::Tx { .. },
21112111
..
21122112
} => {},

0 commit comments

Comments
 (0)