Make tests touching forward_htlcs more strict

Previously, some of the tests manipulating `forward_htlcs` were just
iterating, but not actually checking whether the expected entries were
present and they were actually changed. Here we make these test cases
more strict.

Author: tnull

lightning/src/ln/onion_route_tests.rs

@@ -1173,17 +1173,21 @@ fn test_onion_failure() {
 		|_| {},
 		|| {
 			nodes[1].node.process_pending_update_add_htlcs();
-			for (_, pending_forwards) in nodes[1].node.forward_htlcs.lock().unwrap().iter_mut() {
-				for f in pending_forwards.iter_mut() {
-					match f {
-						&mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
-							ref mut forward_info,
-							..
-						}) => forward_info.outgoing_cltv_value -= 1,
-						_ => {},
-					}
+			assert_eq!(nodes[1].node.forward_htlcs.lock().unwrap().len(), 1);
+			if let Some((_, pending_forwards)) =
+				nodes[1].node.forward_htlcs.lock().unwrap().iter_mut().next()
+			{
+				assert_eq!(pending_forwards.len(), 1);
+				match pending_forwards.get_mut(0).unwrap() {
+					&mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
+						ref mut forward_info,
+						..
+					}) => forward_info.outgoing_cltv_value -= 1,
+					_ => panic!("Unexpected HTLCForwardInfo"),
 				}
-			}
+			} else {
+				panic!("Expected pending forwards!");
+			};
 		},
 		true,
 		Some(LocalHTLCFailureReason::FinalIncorrectCLTVExpiry),
@@ -1203,17 +1207,21 @@ fn test_onion_failure() {
 		|| {
 			nodes[1].node.process_pending_update_add_htlcs();
 			// violate amt_to_forward > msg.amount_msat
-			for (_, pending_forwards) in nodes[1].node.forward_htlcs.lock().unwrap().iter_mut() {
-				for f in pending_forwards.iter_mut() {
-					match f {
-						&mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
-							ref mut forward_info,
-							..
-						}) => forward_info.outgoing_amt_msat -= 1,
-						_ => {},
-					}
+			assert_eq!(nodes[1].node.forward_htlcs.lock().unwrap().len(), 1);
+			if let Some((_, pending_forwards)) =
+				nodes[1].node.forward_htlcs.lock().unwrap().iter_mut().next()
+			{
+				assert_eq!(pending_forwards.len(), 1);
+				match pending_forwards.get_mut(0).unwrap() {
+					&mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
+						ref mut forward_info,
+						..
+					}) => forward_info.outgoing_amt_msat -= 1,
+					_ => panic!("Unexpected HTLCForwardInfo"),
 				}
-			}
+			} else {
+				panic!("Expected pending forwards!");
+			};
 		},
 		true,
 		Some(LocalHTLCFailureReason::FinalIncorrectHTLCAmount),
@@ -1553,16 +1561,21 @@ fn test_overshoot_final_cltv() {
 	commitment_signed_dance!(nodes[1], nodes[0], &update_0.commitment_signed, false, true);
 
 	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
-	for (_, pending_forwards) in nodes[1].node.forward_htlcs.lock().unwrap().iter_mut() {
-		for f in pending_forwards.iter_mut() {
-			match f {
-				&mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
-					ref mut forward_info, ..
-				}) => forward_info.outgoing_cltv_value += 1,
-				_ => {},
-			}
+	nodes[1].node.process_pending_update_add_htlcs();
+	assert_eq!(nodes[1].node.forward_htlcs.lock().unwrap().len(), 1);
+	if let Some((_, pending_forwards)) =
+		nodes[1].node.forward_htlcs.lock().unwrap().iter_mut().next()
+	{
+		assert_eq!(pending_forwards.len(), 1);
+		match pending_forwards.get_mut(0).unwrap() {
+			&mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo { ref mut forward_info, .. }) => {
+				forward_info.outgoing_cltv_value += 1
+			},
+			_ => panic!("Unexpected HTLCForwardInfo"),
 		}
-	}
+	} else {
+		panic!("Expected pending forwards!");
+	};
 	expect_and_process_pending_htlcs(&nodes[1], false);
 
 	check_added_monitors!(&nodes[1], 1);
@@ -2614,19 +2627,22 @@ fn test_phantom_final_incorrect_cltv_expiry() {
 	nodes[1].node.process_pending_update_add_htlcs();
 
 	// Modify the payload so the phantom hop's HMAC is bogus.
-	for (_, pending_forwards) in nodes[1].node.forward_htlcs.lock().unwrap().iter_mut() {
-		for f in pending_forwards.iter_mut() {
-			match f {
-				&mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
-					forward_info: PendingHTLCInfo { ref mut outgoing_cltv_value, .. },
-					..
-				}) => {
-					*outgoing_cltv_value -= 1;
-				},
-				_ => panic!("Unexpected forward"),
-			}
+	if let Some((_, pending_forwards)) =
+		nodes[1].node.forward_htlcs.lock().unwrap().iter_mut().next()
+	{
+		assert_eq!(pending_forwards.len(), 1);
+		match pending_forwards.get_mut(0).unwrap() {
+			&mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
+				forward_info: PendingHTLCInfo { ref mut outgoing_cltv_value, .. },
+				..
+			}) => {
+				*outgoing_cltv_value -= 1;
+			},
+			_ => panic!("Unexpected HTLCForwardInfo"),
 		}
-	}
+	} else {
+		panic!("Expected pending forwards!");
+	};
 	nodes[1].node.process_pending_htlc_forwards();
 	expect_htlc_failure_conditions(
 		nodes[1].node.get_and_clear_pending_events(),

lightning/src/ln/payment_tests.rs

@@ -636,24 +636,30 @@ fn test_reject_mpp_keysend_htlc_mismatching_secret() {
 	nodes[3].node.process_pending_update_add_htlcs();
 
 	assert!(nodes[3].node.get_and_clear_pending_msg_events().is_empty());
-	for (_, pending_forwards) in nodes[3].node.forward_htlcs.lock().unwrap().iter_mut() {
-		for f in pending_forwards.iter_mut() {
-			match f {
-				&mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
-					ref mut forward_info, ..
-				}) => match forward_info.routing {
+	assert_eq!(nodes[3].node.forward_htlcs.lock().unwrap().len(), 1);
+	if let Some((_, pending_forwards)) =
+		nodes[3].node.forward_htlcs.lock().unwrap().iter_mut().next()
+	{
+		assert_eq!(pending_forwards.len(), 1);
+		match pending_forwards.get_mut(0).unwrap() {
+			&mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo { ref mut forward_info, .. }) => {
+				match forward_info.routing {
 					PendingHTLCRouting::ReceiveKeysend { ref mut payment_data, .. } => {
 						*payment_data = Some(msgs::FinalOnionHopData {
 							payment_secret: PaymentSecret([42; 32]),
 							total_msat: amount * 2,
 						});
 					},
 					_ => panic!("Expected PendingHTLCRouting::ReceiveKeysend"),
-				},
-				_ => {},
-			}
+				}
+			},
+			_ => {
+				panic!("Unexpected HTLCForwardInfo");
+			},
 		}
-	}
+	} else {
+		panic!("Expected pending receive");
+	};
 	nodes[3].node.process_pending_htlc_forwards();
 
 	// Pay along nodes[2]
@@ -685,26 +691,30 @@ fn test_reject_mpp_keysend_htlc_mismatching_secret() {
 	nodes[3].node.process_pending_update_add_htlcs();
 
 	assert!(nodes[3].node.get_and_clear_pending_msg_events().is_empty());
-	for (_, pending_forwards) in nodes[3].node.forward_htlcs.lock().unwrap().iter_mut() {
-		for f in pending_forwards.iter_mut() {
-			match f {
-				&mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
-					ref mut forward_info, ..
-				}) => {
-					match forward_info.routing {
-						PendingHTLCRouting::ReceiveKeysend { ref mut payment_data, .. } => {
-							*payment_data = Some(msgs::FinalOnionHopData {
-								payment_secret: PaymentSecret([43; 32]), // Doesn't match the secret used above
-								total_msat: amount * 2,
-							});
-						},
-						_ => panic!("Expected PendingHTLCRouting::ReceiveKeysend"),
-					}
-				},
-				_ => {},
-			}
+	assert_eq!(nodes[3].node.forward_htlcs.lock().unwrap().len(), 1);
+	if let Some((_, pending_forwards)) =
+		nodes[3].node.forward_htlcs.lock().unwrap().iter_mut().next()
+	{
+		assert_eq!(pending_forwards.len(), 1);
+		match pending_forwards.get_mut(0).unwrap() {
+			&mut HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo { ref mut forward_info, .. }) => {
+				match forward_info.routing {
+					PendingHTLCRouting::ReceiveKeysend { ref mut payment_data, .. } => {
+						*payment_data = Some(msgs::FinalOnionHopData {
+							payment_secret: PaymentSecret([43; 32]), // Doesn't match the secret used above
+							total_msat: amount * 2,
+						});
+					},
+					_ => panic!("Expected PendingHTLCRouting::ReceiveKeysend"),
+				}
+			},
+			_ => {
+				panic!("Unexpected HTLCForwardInfo");
+			},
 		}
-	}
+	} else {
+		panic!("Expected pending receive");
+	};
 	nodes[3].node.process_pending_htlc_forwards();
 	let fail_type = HTLCHandlingFailureType::Receive { payment_hash };
 	expect_and_process_pending_htlcs_and_htlc_handling_failed(&nodes[3], &[fail_type]);