X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=lightning-transaction-sync%2Fsrc%2Fesplora.rs;h=3f0d4828355161ac0a807a9004636ad3961814ac;hb=82f4c10e18f9cbe5359a20433fa7638a66c4f96f;hp=1a3ae2c224dfcc5657a9416508c58fec9518e155;hpb=48c46bf7720ccf449765ae1a7e04a0b80a918b02;p=rust-lightning

diff --git a/lightning-transaction-sync/src/esplora.rs b/lightning-transaction-sync/src/esplora.rs
index 1a3ae2c2..3f0d4828 100644
--- a/lightning-transaction-sync/src/esplora.rs
+++ b/lightning-transaction-sync/src/esplora.rs
@@ -123,7 +123,7 @@ where
 								continue;
 							}
 							num_unconfirmed += unconfirmed_txs.len();
-							self.sync_unconfirmed_transactions(&mut sync_state, &confirmables, unconfirmed_txs);
+							sync_state.sync_unconfirmed_transactions(&confirmables, unconfirmed_txs);
 						},
 						Err(err) => {
 							// (Semi-)permanent failure, retry later.
@@ -169,8 +169,7 @@ where
 						}
 
 						num_confirmed += confirmed_txs.len();
-						self.sync_confirmed_transactions(
-							&mut sync_state,
+						sync_state.sync_confirmed_transactions(
 							&confirmables,
 							confirmed_txs,
 						);
@@ -221,26 +220,6 @@ where
 		Ok(())
 	}
 
-	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);
-			}
-		}
-	}
-
 	#[maybe_async]
 	fn get_confirmed_transactions(
 		&self, sync_state: &SyncState,
@@ -360,18 +339,6 @@ where
 		Ok(unconfirmed_txs)
 	}
 
-	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);
-		}
-	}
-
 	/// Returns a reference to the underlying esplora client.
 	pub fn client(&self) -> &EsploraClientType {
 		&self.client