f Use other match pattern here already

.. to keep changes in the following commits minimal.

Author: tnull

lightning/src/ln/payment_tests.rs

@@ -637,29 +637,22 @@ fn test_reject_mpp_keysend_htlc_mismatching_secret() {
 
 	assert!(nodes[3].node.get_and_clear_pending_msg_events().is_empty());
 	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");
-	};
+	match nodes[3].node.forward_htlcs.lock().unwrap().get_mut(&0).unwrap().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");
+		},
+	}
 	nodes[3].node.process_pending_htlc_forwards();
 
 	// Pay along nodes[2]
@@ -687,34 +680,26 @@ fn test_reject_mpp_keysend_htlc_mismatching_secret() {
 	let update_add_3 = update_3.update_add_htlcs[0].clone();
 	nodes[3].node.handle_update_add_htlc(node_c_id, &update_add_3);
 	commitment_signed_dance!(nodes[3], nodes[2], update_3.commitment_signed, false, true);
-	expect_htlc_failure_conditions(nodes[3].node.get_and_clear_pending_events(), &[]);
-	nodes[3].node.process_pending_update_add_htlcs();
-
+	assert!(nodes[3].node.get_and_clear_pending_events().is_empty());
 	assert!(nodes[3].node.get_and_clear_pending_msg_events().is_empty());
+	nodes[3].node.process_pending_update_add_htlcs();
 	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");
-	};
+	match nodes[3].node.forward_htlcs.lock().unwrap().get_mut(&0).unwrap().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");
+		},
+	}
 	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]);