f assert htlc resolution tx is the htlc-output-spending tx

Author: TheBlueMatt

lightning/src/chain/channelmonitor.rs

@@ -1486,9 +1486,8 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 						}
 						let htlc_resolved = us.htlcs_resolved_on_chain.iter()
 							.find(|v| if v.commitment_tx_output_idx == htlc_commitment_tx_output_idx {
-								if v.resolving_txid != confirmed_txid {
-									htlc_spend_txid_opt = v.resolving_txid;
-								}
+								debug_assert_ne!(v.resolving_txid, confirmed_txid);
+								htlc_spend_txid_opt = v.resolving_txid;
 								true
 							} else { false });
 						debug_assert!(htlc_update_pending.is_some() as u8 + htlc_spend_pending.is_some() as u8 + htlc_resolved.is_some() as u8 <= 1);