f Move sync_ methods to SyncState

Author: tnull

lightning-transaction-sync/src/electrum.rs

@@ -10,7 +10,7 @@ use lightning::{log_error, log_debug, log_trace};
 use lightning::chain::WatchedOutput;
 use lightning::chain::{Confirm, Filter};
 
-use bitcoin::{BlockHash, BlockHeader, Script, Transaction, Txid, TxMerkleNode};
+use bitcoin::{BlockHash, Script, Transaction, Txid, TxMerkleNode};
 use bitcoin::hashes::Hash;
 use bitcoin::hashes::sha256d::Hash as Sha256d;
 
@@ -119,9 +119,12 @@ where
 							}
 
 							num_unconfirmed += unconfirmed_txs.len();
-							self.sync_unconfirmed_transactions(&mut sync_state, &confirmables,
+							sync_state.sync_unconfirmed_transactions(&confirmables,
 								unconfirmed_txs);
-							self.sync_best_block_updated(&confirmables, &tip_header, tip_height);
+
+							for c in &confirmables {
+								c.best_block_updated(&tip_header, tip_height);
+							}
 						},
 						Err(err) => {
 							// (Semi-)permanent failure, retry later.
@@ -146,8 +149,7 @@ where
 						}
 
 						num_confirmed += confirmed_txs.len();
-						self.sync_confirmed_transactions(
-							&mut sync_state,
+						sync_state.sync_confirmed_transactions(
 							&confirmables,
 							confirmed_txs,
 						);
@@ -177,50 +179,6 @@ where
 		Ok(())
 	}
 
-	fn sync_unconfirmed_transactions(
-		&self, sync_state: &mut SyncState, confirmables: &Vec<&(dyn Confirm + Sync + Send)>,
-		unconfirmed_txs: Vec<Txid>,
-	) {
-		for txid in unconfirmed_txs {
-			for c in confirmables {
-				c.transaction_unconfirmed(&txid);
-			}
-
-			sync_state.watched_transactions.insert(txid);
-		}
-	}
-
-
-	fn sync_best_block_updated(
-		&self, confirmables: &Vec<&(dyn Confirm + Sync + Send)>, tip_header: &BlockHeader,
-		tip_height: u32,
-	) {
-		for c in confirmables {
-			c.best_block_updated(&tip_header, tip_height);
-		}
-	}
-
-	fn sync_confirmed_transactions(
-		&self, sync_state: &mut SyncState, confirmables: &Vec<&(dyn Confirm + Sync + Send)>,
-		confirmed_txs: Vec<ConfirmedTx>
-	) {
-		for ctx in confirmed_txs {
-			for c in confirmables {
-				c.transactions_confirmed(
-					&ctx.block_header,
-					&[(ctx.pos, &ctx.tx)],
-					ctx.block_height,
-				);
-			}
-
-			sync_state.watched_transactions.remove(&ctx.tx.txid());
-
-			for input in &ctx.tx.input {
-				sync_state.watched_outputs.remove(&input.previous_output);
-			}
-		}
-	}
-
 	fn get_confirmed_transactions(
 		&self, sync_state: &SyncState,
 	) -> Result<Vec<ConfirmedTx>, InternalError> {