f tests

Author: G8XSU

lightning/src/chain/channelmonitor.rs

@@ -2783,7 +2783,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 		if let Some(txid) = self.prev_counterparty_commitment_txid {
 			if txid == confirmed_spend_txid {
 				if let Some(commitment_number) = self.counterparty_commitment_txn_on_chain.get(&txid) {
-					let htlc_outputs: Vec<HTLCOutputInCommitment> = self.counterparty_claimable_outpoints.get(&txid).unwrap().iter().map(|(htlc, _)| htlc.clone()).collect();
+					let htlc_outputs: Vec<HTLCOutputInCommitment> = self.counterparty_claimable_outpoints.get(&txid).unwrap_or(&vec![]).iter().map(|(htlc, _)| htlc.clone()).collect();
 					claim_htlcs!(*commitment_number, txid, htlc_outputs.as_ref());
 				} else {
 					debug_assert!(false);
@@ -3356,19 +3356,14 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 
 	/// Returns the HTLC claim package templates and the counterparty output info
 	fn get_counterparty_output_claim_info(&self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>, per_commitment_claimable_outpoints: &Vec<HTLCOutputInCommitment>)
-	                                      -> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
+		-> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
 		let mut claimable_outpoints = Vec::new();
 		let mut to_counterparty_output_info: CommitmentTxCounterpartyOutputInfo = None;
 
-		// let per_commitment_claimable_outpoints = self.counterparty_claimable_outpoints.get(&commitment_txid).unwrap();
-		// let per_commitment_claimable_outpoints = match Some(per_commitment_claimable_outpoints) {
-		// 	Some(outputs) => outputs,
-		// 	None => return (claimable_outpoints, to_counterparty_output_info),
-		// };
-		let per_commitment_points = match self.their_cur_per_commitment_points {
-			Some(points) => points,
-			None => return (claimable_outpoints, to_counterparty_output_info),
-		};
+		if per_commitment_claimable_outpoints.is_empty() || self.their_cur_per_commitment_points.is_none(){
+			return (claimable_outpoints, to_counterparty_output_info);
+		}
+		let per_commitment_points = self.their_cur_per_commitment_points.as_ref().unwrap();
 
 		let per_commitment_point =
 			// If the counterparty commitment tx is the latest valid state, use their latest
@@ -3775,7 +3770,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 				// (except for HTLC transactions for channels with anchor outputs), which is an easy
 				// way to filter out any potential non-matching txn for lazy filters.
 				let prevout = &tx.input[0].previous_output;
-				let per_commitment_claimable_outpoints: Vec<HTLCOutputInCommitment> = self.counterparty_claimable_outpoints.get(&tx.txid()).unwrap().iter().map(|(htlc, _)| htlc.clone()).collect();
+				let per_commitment_claimable_outpoints: Vec<HTLCOutputInCommitment> = self.counterparty_claimable_outpoints.get(&tx.txid()).unwrap_or(&vec![]).iter().map(|(htlc, _)| htlc.clone()).collect();
 				if prevout.txid == self.funding_info.0.txid && prevout.vout == self.funding_info.0.index as u32 {
 					let mut balance_spendable_csv = None;
 					log_info!(logger, "Channel {} closed by funding output spend in txid {}.",
@@ -4226,9 +4221,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 			}
 
 			macro_rules! check_htlc_valid_counterparty {
-				($counterparty_txid: expr, $htlc_output: expr, $per_commitment_data: expr) => {
-					// if let Some(txid) = $counterparty_txid
-					{
+				($htlc_output: expr, $per_commitment_data: expr) => {
 						for &(ref pending_htlc, ref pending_source) in $per_commitment_data {
 							if pending_htlc.payment_hash == $htlc_output.payment_hash && pending_htlc.amount_msat == $htlc_output.amount_msat {
 								if let &Some(ref source) = pending_source {
@@ -4238,7 +4231,6 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 								}
 							}
 						}
-					}
 				}
 			}
 
@@ -4255,9 +4247,13 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 								// resolve the source HTLC with the original sender.
 								payment_data = Some(((*source).clone(), htlc_output.payment_hash, htlc_output.amount_msat));
 							} else if !$holder_tx {
-								check_htlc_valid_counterparty!(self.current_counterparty_commitment_txid, htlc_output, self.counterparty_claimable_outpoints.get(&self.current_counterparty_commitment_txid.unwrap()).unwrap());
+								if let Some(current_counterparty_commitment_txid) = &self.current_counterparty_commitment_txid {
+									check_htlc_valid_counterparty!(htlc_output, self.counterparty_claimable_outpoints.get(current_counterparty_commitment_txid).unwrap());
+								}
 								if payment_data.is_none() {
-									check_htlc_valid_counterparty!(self.prev_counterparty_commitment_txid, htlc_output, self.counterparty_claimable_outpoints.get(&self.prev_counterparty_commitment_txid.unwrap()).unwrap());
+									if let Some(prev_counterparty_commitment_txid) = &self.prev_counterparty_commitment_txid {
+										check_htlc_valid_counterparty!(htlc_output, self.counterparty_claimable_outpoints.get(prev_counterparty_commitment_txid).unwrap());
+									}
 								}
 							}
 							if payment_data.is_none() {