X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fchannelmonitor.rs;h=5cc8030a6a1dc33b8ad58c1bb877ee808f34a6a0;hb=e8939e26bc8fdf90a2f7b8aec38e5171a54764b4;hp=6992eb192abf98b35c7e569646893e27a0abe158;hpb=2701bc512ad0d73a3309bf87a6b2487b2bfe00bf;p=rust-lightning

diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs
index 6992eb19..5cc8030a 100644
--- a/lightning/src/chain/channelmonitor.rs
+++ b/lightning/src/chain/channelmonitor.rs
@@ -1928,6 +1928,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 		let inner = self.inner.lock().unwrap();
 		f(&inner.onchain_tx_handler.signer);
 	}
+
+	#[cfg(test)]
+	pub fn do_mut_signer_call<F: FnMut(&mut Signer) -> ()>(&self, mut f: F) {
+		let mut inner = self.inner.lock().unwrap();
+		f(&mut inner.onchain_tx_handler.signer);
+	}
 }
 
 impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
@@ -2873,7 +2879,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 		F::Target: FeeEstimator,
 		L::Target: Logger,
 	{
-		let (claimable_outpoints, _) = self.generate_claimable_outpoints_and_watch_outputs(ClosureReason::HolderForceClosed);
+		let (claimable_outpoints, _) = self.generate_claimable_outpoints_and_watch_outputs(ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(true) });
 		self.onchain_tx_handler.update_claims_view_from_requests(
 			claimable_outpoints, self.best_block.height, self.best_block.height, broadcaster,
 			fee_estimator, logger
@@ -3105,9 +3111,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 							},
 							commitment_txid: htlc.commitment_txid,
 							per_commitment_number: htlc.per_commitment_number,
-							per_commitment_point: self.onchain_tx_handler.signer.get_per_commitment_point(
-								htlc.per_commitment_number, &self.onchain_tx_handler.secp_ctx,
-							),
+							per_commitment_point: htlc.per_commitment_point,
 							feerate_per_kw: 0,
 							htlc: htlc.htlc,
 							preimage: htlc.preimage,