mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-23 22:56:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

rustfmt: Reformat lightning-transaction-sync/src/common.rs

Browse source
This commit is contained in:
Elias Rohrer 2024-06-06 09:21:15 +02:00
parent 777ce7b059
commit 3ead26323e
No known key found for this signature in database
GPG key ID: 36153082BDF676FD
2 changed files with 25 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
lightning-transaction-sync/src/common.rs
View file

@ -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<C: Deref>(
&mut self, confirmables: &Vec<C>,
unconfirmed_txs: Vec<Txid>,
)
where C::Target: Confirm,
&mut self, confirmables: &Vec<C>, unconfirmed_txs: Vec<Txid>,
) 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<C: Deref>(
&mut self, confirmables: &Vec<C>,
confirmed_txs: Vec<ConfirmedTx>
)
where C::Target: Confirm,
&mut self, confirmables: &Vec<C>, confirmed_txs: Vec<ConfirmedTx>,
) 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`].

1
rustfmt_excluded_files
View file

@ -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