From 3ead26323ef6eaf4f1c19324876c44803f512dfa Mon Sep 17 00:00:00 2001 From: Elias Rohrer Date: Thu, 6 Jun 2024 09:21:15 +0200 Subject: [PATCH] `rustfmt`: Reformat `lightning-transaction-sync/src/common.rs` --- lightning-transaction-sync/src/common.rs | 55 +++++++++++------------- rustfmt_excluded_files | 1 - 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/lightning-transaction-sync/src/common.rs b/lightning-transaction-sync/src/common.rs index d68ac9591..420d7d8a9 100644 --- a/lightning-transaction-sync/src/common.rs +++ b/lightning-transaction-sync/src/common.rs @@ -1,12 +1,11 @@ -use lightning::chain::{Confirm, WatchedOutput}; -use lightning::chain::channelmonitor::ANTI_REORG_DELAY; -use bitcoin::{Txid, BlockHash, Transaction, OutPoint}; use bitcoin::block::Header; +use bitcoin::{BlockHash, OutPoint, Transaction, Txid}; +use lightning::chain::channelmonitor::ANTI_REORG_DELAY; +use lightning::chain::{Confirm, WatchedOutput}; -use std::collections::{HashSet, HashMap}; +use std::collections::{HashMap, HashSet}; use std::ops::Deref; - // Represents the current state. pub(crate) struct SyncState { // Transactions that were previously processed, but must not be forgotten @@ -35,10 +34,9 @@ impl SyncState { } } pub fn sync_unconfirmed_transactions( - &mut self, confirmables: &Vec, - unconfirmed_txs: Vec, - ) - where C::Target: Confirm, + &mut self, confirmables: &Vec, unconfirmed_txs: Vec, + ) where + C::Target: Confirm, { for txid in unconfirmed_txs { for c in confirmables { @@ -49,22 +47,23 @@ impl SyncState { // If a previously-confirmed output spend is unconfirmed, re-add the watched output to // the tracking map. - self.outputs_spends_pending_threshold_conf.retain(|(conf_txid, _, prev_outpoint, output)| { - if txid == *conf_txid { - self.watched_outputs.insert(*prev_outpoint, output.clone()); - false - } else { - true - } - }) + self.outputs_spends_pending_threshold_conf.retain( + |(conf_txid, _, prev_outpoint, output)| { + if txid == *conf_txid { + self.watched_outputs.insert(*prev_outpoint, output.clone()); + false + } else { + true + } + }, + ) } } pub fn sync_confirmed_transactions( - &mut self, confirmables: &Vec, - confirmed_txs: Vec - ) - where C::Target: Confirm, + &mut self, confirmables: &Vec, confirmed_txs: Vec, + ) where + C::Target: Confirm, { for ctx in confirmed_txs { for c in confirmables { @@ -79,20 +78,19 @@ impl SyncState { for input in &ctx.tx.input { if let Some(output) = self.watched_outputs.remove(&input.previous_output) { - self.outputs_spends_pending_threshold_conf.push((ctx.tx.txid(), ctx.block_height, input.previous_output, output)); + let spent = (ctx.tx.txid(), ctx.block_height, input.previous_output, output); + self.outputs_spends_pending_threshold_conf.push(spent); } } } } pub fn prune_output_spends(&mut self, cur_height: u32) { - self.outputs_spends_pending_threshold_conf.retain(|(_, conf_height, _, _)| { - cur_height < conf_height + ANTI_REORG_DELAY - 1 - }); + self.outputs_spends_pending_threshold_conf + .retain(|(_, conf_height, _, _)| cur_height < conf_height + ANTI_REORG_DELAY - 1); } } - // A queue that is to be filled by `Filter` and drained during the next syncing round. pub(crate) struct FilterQueue { // Transactions that were registered via the `Filter` interface and have to be processed. @@ -103,10 +101,7 @@ pub(crate) struct FilterQueue { impl FilterQueue { pub fn new() -> Self { - Self { - transactions: HashSet::new(), - outputs: HashMap::new(), - } + Self { transactions: HashSet::new(), outputs: HashMap::new() } } // Processes the transaction and output queues and adds them to the given [`SyncState`]. diff --git a/rustfmt_excluded_files b/rustfmt_excluded_files index 36d85ef20..8cc53a530 100644 --- a/rustfmt_excluded_files +++ b/rustfmt_excluded_files @@ -159,7 +159,6 @@ ./lightning-rapid-gossip-sync/src/error.rs ./lightning-rapid-gossip-sync/src/lib.rs ./lightning-rapid-gossip-sync/src/processing.rs -./lightning-transaction-sync/src/common.rs ./lightning-transaction-sync/src/electrum.rs ./lightning-transaction-sync/src/error.rs ./lightning-transaction-sync/src/esplora.rs -- 2.39.5