From ad7021ae30f83a649401bb56577b391983074734 Mon Sep 17 00:00:00 2001 From: Elias Rohrer Date: Thu, 20 Jun 2024 11:09:15 +0200 Subject: [PATCH] `rustfmt`: Run on `lightning-block-sync/src/test_utils.rs` --- lightning-block-sync/src/test_utils.rs | 26 +++++++++++++++++++------- rustfmt_excluded_files | 1 - 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/lightning-block-sync/src/test_utils.rs b/lightning-block-sync/src/test_utils.rs index 84c65f244..506c2183e 100644 --- a/lightning-block-sync/src/test_utils.rs +++ b/lightning-block-sync/src/test_utils.rs @@ -1,13 +1,16 @@ -use crate::{AsyncBlockSourceResult, BlockData, BlockHeaderData, BlockSource, BlockSourceError, UnboundedCache}; use crate::poll::{Validate, ValidatedBlockHeader}; +use crate::{ + AsyncBlockSourceResult, BlockData, BlockHeaderData, BlockSource, BlockSourceError, + UnboundedCache, +}; use bitcoin::blockdata::block::{Block, Header, Version}; use bitcoin::blockdata::constants::genesis_block; use bitcoin::blockdata::locktime::absolute::LockTime; use bitcoin::hash_types::{BlockHash, TxMerkleNode}; use bitcoin::network::Network; -use bitcoin::Transaction; use bitcoin::transaction; +use bitcoin::Transaction; use lightning::chain; @@ -48,7 +51,7 @@ impl Blockchain { version: transaction::Version(0), lock_time: LockTime::ZERO, input: vec![], - output: vec![] + output: vec![], }; let merkle_root = TxMerkleNode::from_raw_hash(coinbase.txid().to_raw_hash()); self.blocks.push(Block { @@ -135,7 +138,9 @@ impl Blockchain { } impl BlockSource for Blockchain { - fn get_header<'a>(&'a self, header_hash: &'a BlockHash, _height_hint: Option) -> AsyncBlockSourceResult<'a, BlockHeaderData> { + fn get_header<'a>( + &'a self, header_hash: &'a BlockHash, _height_hint: Option, + ) -> AsyncBlockSourceResult<'a, BlockHeaderData> { Box::pin(async move { if self.without_headers { return Err(BlockSourceError::persistent("header not found")); @@ -155,7 +160,9 @@ impl BlockSource for Blockchain { }) } - fn get_block<'a>(&'a self, header_hash: &'a BlockHash) -> AsyncBlockSourceResult<'a, BlockData> { + fn get_block<'a>( + &'a self, header_hash: &'a BlockHash, + ) -> AsyncBlockSourceResult<'a, BlockData> { Box::pin(async move { for (height, block) in self.blocks.iter().enumerate() { if block.header.block_hash() == *header_hash { @@ -192,7 +199,10 @@ impl BlockSource for Blockchain { pub struct NullChainListener; impl chain::Listen for NullChainListener { - fn filtered_block_connected(&self, _header: &Header, _txdata: &chain::transaction::TransactionData, _height: u32) {} + fn filtered_block_connected( + &self, _header: &Header, _txdata: &chain::transaction::TransactionData, _height: u32, + ) { + } fn block_disconnected(&self, _header: &Header, _height: u32) {} } @@ -240,7 +250,9 @@ impl chain::Listen for MockChainListener { } } - fn filtered_block_connected(&self, header: &Header, _txdata: &chain::transaction::TransactionData, height: u32) { + fn filtered_block_connected( + &self, header: &Header, _txdata: &chain::transaction::TransactionData, height: u32, + ) { match self.expected_filtered_blocks_connected.borrow_mut().pop_front() { None => { panic!("Unexpected filtered block connected: {:?}", header.block_hash()); diff --git a/rustfmt_excluded_files b/rustfmt_excluded_files index 98f412a82..7b942c5f6 100644 --- a/rustfmt_excluded_files +++ b/rustfmt_excluded_files @@ -1,6 +1,5 @@ ./lightning-background-processor/src/lib.rs ./lightning-block-sync/src/lib.rs -./lightning-block-sync/src/test_utils.rs ./lightning-block-sync/src/utils.rs ./lightning-custom-message/src/lib.rs ./lightning-invoice/fuzz/fuzz_targets/serde_data_part.rs -- 2.39.5