X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fchannelmonitor.rs;h=a93985e094816ed153dcc51eca4e6f971c30eff1;hb=27461902ab3acd1b665ec9a91fd1768dbfee1c36;hp=92f1a8df45d8e88bb75e9db80c7974fa89a430ec;hpb=53eb0d7aa7e7ee2c247a509d259fbdc7cf840426;p=rust-lightning

diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs
index 92f1a8df..a93985e0 100644
--- a/lightning/src/chain/channelmonitor.rs
+++ b/lightning/src/chain/channelmonitor.rs
@@ -2444,7 +2444,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 			let per_commitment_key = ignore_error!(SecretKey::from_slice(&secret));
 			let per_commitment_point = PublicKey::from_secret_key(&self.secp_ctx, &per_commitment_key);
 			let revocation_pubkey = ignore_error!(chan_utils::derive_public_revocation_key(&self.secp_ctx, &per_commitment_point, &self.holder_revocation_basepoint));
-			let delayed_key = ignore_error!(chan_utils::derive_public_key(&self.secp_ctx, &PublicKey::from_secret_key(&self.secp_ctx, &per_commitment_key), &self.counterparty_commitment_params.counterparty_delayed_payment_base_key));
+			let delayed_key = chan_utils::derive_public_key(&self.secp_ctx, &PublicKey::from_secret_key(&self.secp_ctx, &per_commitment_key), &self.counterparty_commitment_params.counterparty_delayed_payment_base_key);
 
 			let revokeable_redeemscript = chan_utils::get_revokeable_redeemscript(&revocation_pubkey, self.counterparty_commitment_params.on_counterparty_tx_csv, &delayed_key);
 			let revokeable_p2wsh = revokeable_redeemscript.to_v0_p2wsh();
@@ -2560,17 +2560,12 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 				if let Ok(revocation_pubkey) = chan_utils::derive_public_revocation_key(
 					&self.secp_ctx, &per_commitment_point, &self.holder_revocation_basepoint)
 				{
-					if let Ok(delayed_key) = chan_utils::derive_public_key(&self.secp_ctx,
+					let delayed_key = chan_utils::derive_public_key(&self.secp_ctx,
 						&per_commitment_point,
-						&self.counterparty_commitment_params.counterparty_delayed_payment_base_key)
-					{
-						Some(chan_utils::get_revokeable_redeemscript(&revocation_pubkey,
-							self.counterparty_commitment_params.on_counterparty_tx_csv,
-							&delayed_key).to_v0_p2wsh())
-					} else {
-						debug_assert!(false, "Failed to derive a delayed payment key for a commitment state we accepted");
-						None
-					}
+						&self.counterparty_commitment_params.counterparty_delayed_payment_base_key);
+					Some(chan_utils::get_revokeable_redeemscript(&revocation_pubkey,
+						self.counterparty_commitment_params.on_counterparty_tx_csv,
+						&delayed_key).to_v0_p2wsh())
 				} else {
 					debug_assert!(false, "Failed to derive a revocation pubkey key for a commitment state we accepted");
 					None