X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fchainmonitor.rs;h=f708bfe9b6110e543e1a7d6aad63a34fcd7e08ed;hb=e84f5edbc5b959c7bbad17b5968f2c9e32df68df;hp=8c2e761fa46dad5445dece213b4fc38e85f01475;hpb=93d20ff63e7b2b41804f46a4e1e342f82ede1d27;p=rust-lightning

diff --git a/lightning/src/chain/chainmonitor.rs b/lightning/src/chain/chainmonitor.rs
index 8c2e761f..f708bfe9 100644
--- a/lightning/src/chain/chainmonitor.rs
+++ b/lightning/src/chain/chainmonitor.rs
@@ -74,7 +74,7 @@ where C::Target: chain::Filter,
 	    P::Target: channelmonitor::Persist<ChannelSigner>,
 {
 	/// Dispatches to per-channel monitors, which are responsible for updating their on-chain view
-	/// of a channel and reacting accordingly based on transactions in the connected block. See
+	/// of a channel and reacting accordingly based on transactions in the given chain data. See
 	/// [`ChannelMonitor::block_connected`] for details. Any HTLCs that were resolved on chain will
 	/// be returned by [`chain::Watch::release_pending_monitor_events`].
 	///
@@ -82,13 +82,6 @@ where C::Target: chain::Filter,
 	/// calls must not exclude any transactions matching the new outputs nor any in-block
 	/// descendants of such transactions. It is not necessary to re-fetch the block to obtain
 	/// updated `txdata`.
-	pub fn block_connected(&self, header: &BlockHeader, txdata: &TransactionData, height: u32) {
-		self.process_chain_data(header, txdata, |monitor, txdata| {
-			monitor.block_connected(
-				header, txdata, height, &*self.broadcaster, &*self.fee_estimator, &*self.logger)
-		});
-	}
-
 	fn process_chain_data<FN>(&self, header: &BlockHeader, txdata: &TransactionData, process: FN)
 	where
 		FN: Fn(&ChannelMonitor<ChannelSigner>, &TransactionData) -> Vec<TransactionOutputs>
@@ -129,16 +122,6 @@ where C::Target: chain::Filter,
 		}
 	}
 
-	/// Dispatches to per-channel monitors, which are responsible for updating their on-chain view
-	/// of a channel based on the disconnected block. See [`ChannelMonitor::block_disconnected`] for
-	/// details.
-	pub fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
-		let monitors = self.monitors.read().unwrap();
-		for monitor in monitors.values() {
-			monitor.block_disconnected(header, disconnected_height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
-		}
-	}
-
 	/// Creates a new `ChainMonitor` used to watch on-chain activity pertaining to channels.
 	///
 	/// When an optional chain source implementing [`chain::Filter`] is provided, the chain monitor
@@ -158,10 +141,9 @@ where C::Target: chain::Filter,
 	}
 }
 
-impl<ChannelSigner: Sign, C: Deref + Send + Sync, T: Deref + Send + Sync, F: Deref + Send + Sync, L: Deref + Send + Sync, P: Deref + Send + Sync>
+impl<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref>
 chain::Listen for ChainMonitor<ChannelSigner, C, T, F, L, P>
 where
-	ChannelSigner: Sign,
 	C::Target: chain::Filter,
 	T::Target: BroadcasterInterface,
 	F::Target: FeeEstimator,
@@ -169,19 +151,26 @@ where
 	P::Target: channelmonitor::Persist<ChannelSigner>,
 {
 	fn block_connected(&self, block: &Block, height: u32) {
+		let header = &block.header;
 		let txdata: Vec<_> = block.txdata.iter().enumerate().collect();
-		ChainMonitor::block_connected(self, &block.header, &txdata, height);
+		self.process_chain_data(header, &txdata, |monitor, txdata| {
+			monitor.block_connected(
+				header, txdata, height, &*self.broadcaster, &*self.fee_estimator, &*self.logger)
+		});
 	}
 
 	fn block_disconnected(&self, header: &BlockHeader, height: u32) {
-		ChainMonitor::block_disconnected(self, header, height);
+		let monitors = self.monitors.read().unwrap();
+		for monitor in monitors.values() {
+			monitor.block_disconnected(
+				header, height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
+		}
 	}
 }
 
 impl<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref>
 chain::Confirm for ChainMonitor<ChannelSigner, C, T, F, L, P>
 where
-	ChannelSigner: Sign,
 	C::Target: chain::Filter,
 	T::Target: BroadcasterInterface,
 	F::Target: FeeEstimator,
@@ -225,7 +214,7 @@ where
 	}
 }
 
-impl<ChannelSigner: Sign, C: Deref + Sync + Send, T: Deref + Sync + Send, F: Deref + Sync + Send, L: Deref + Sync + Send, P: Deref + Sync + Send>
+impl<ChannelSigner: Sign, C: Deref , T: Deref , F: Deref , L: Deref , P: Deref >
 chain::Watch<ChannelSigner> for ChainMonitor<ChannelSigner, C, T, F, L, P>
 where C::Target: chain::Filter,
 	    T::Target: BroadcasterInterface,
@@ -353,7 +342,7 @@ mod tests {
 		let (commitment_tx, htlc_tx) = {
 			let payment_preimage = route_payment(&nodes[0], &vec!(&nodes[1])[..], 5_000_000).0;
 			let mut txn = get_local_commitment_txn!(nodes[0], channel.2);
-			claim_payment(&nodes[0], &vec!(&nodes[1])[..], payment_preimage, 5_000_000);
+			claim_payment(&nodes[0], &vec!(&nodes[1])[..], payment_preimage);
 
 			assert_eq!(txn.len(), 2);
 			(txn.remove(0), txn.remove(0))