f - simplify mpp keysend test

The fail case is already tested in test_keysend_msg_with_secret_err.

Author: alecchendev

lightning/src/ln/functional_tests.rs

@@ -8193,9 +8193,10 @@ fn test_simple_mpp() {
 	claim_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[3]], &[&nodes[2], &nodes[3]]], false, payment_preimage);
 }
 
-fn do_test_mpp_keysend(accept_mpp_keysend: bool) {
+#[test]
+fn test_mpp_keysend() {
 	let mut mpp_keysend_config = test_default_channel_config();
-	mpp_keysend_config.accept_mpp_keysend = accept_mpp_keysend;
+	mpp_keysend_config.accept_mpp_keysend = true;
 	let chanmon_cfgs = create_chanmon_cfgs(4);
 	let node_cfgs = create_node_cfgs(4, &chanmon_cfgs);
 	let node_chanmgrs = create_node_chanmgrs(4, &node_cfgs, &[None, None, None, Some(mpp_keysend_config)]);
@@ -8204,7 +8205,7 @@ fn do_test_mpp_keysend(accept_mpp_keysend: bool) {
 	create_announced_chan_between_nodes(&nodes, 0, 1);
 	create_announced_chan_between_nodes(&nodes, 0, 2);
 	create_announced_chan_between_nodes(&nodes, 1, 3);
-	let chan_2_3 = create_announced_chan_between_nodes(&nodes, 2, 3);
+	create_announced_chan_between_nodes(&nodes, 2, 3);
 	let network_graph = nodes[0].network_graph.clone();
 
 	let payer_pubkey = nodes[0].node.get_our_node_id();
@@ -8233,63 +8234,10 @@ fn do_test_mpp_keysend(accept_mpp_keysend: bool) {
 	pass_along_path(&nodes[0], expected_route[0], recv_value, payment_hash.clone(),
 		Some(payment_secret), ev.clone(), false, Some(payment_preimage));
 
-	if accept_mpp_keysend {
-		let ev = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
-		pass_along_path(&nodes[0], expected_route[1], recv_value, payment_hash.clone(),
-			Some(payment_secret), ev.clone(), true, Some(payment_preimage));
-		claim_payment_along_route(&nodes[0], expected_route, false, payment_preimage);
-	} else {
-		let ev = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
-		let mut payment_event = SendEvent::from_event(ev.clone());
-
-		assert_eq!(nodes[2].node.get_our_node_id(), payment_event.node_id);
-
-		nodes[2].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
-		commitment_signed_dance!(nodes[2], nodes[0], payment_event.commitment_msg, false);
-
-		expect_pending_htlcs_forwardable!(nodes[2]);
-		check_added_monitors!(nodes[2], 1);
-
-		let mut events_2 = nodes[2].node.get_and_clear_pending_msg_events();
-		assert_eq!(events_2.len(), 1);
-		payment_event = SendEvent::from_event(events_2.remove(0));
-
-		nodes[3].node.handle_update_add_htlc(&nodes[2].node.get_our_node_id(), &payment_event.msgs[0]);
-		check_added_monitors!(nodes[3], 0);
-		commitment_signed_dance!(nodes[3], nodes[2], payment_event.commitment_msg, false);
-
-		expect_pending_htlcs_forwardable_ignore!(nodes[3]);
-		nodes[3].node.process_pending_htlc_forwards();
-		expect_pending_htlcs_forwardable_and_htlc_handling_failed_ignore!(nodes[3],
-			vec![HTLCDestination::FailedPayment { payment_hash: payment_hash }]);
-		nodes[3].node.process_pending_htlc_forwards();
-
-		check_added_monitors!(nodes[3], 1);
-
-		let fail_updates_1 = get_htlc_update_msgs!(nodes[3], nodes[2].node.get_our_node_id());
-		nodes[2].node.handle_update_fail_htlc(&nodes[3].node.get_our_node_id(), &fail_updates_1.update_fail_htlcs[0]);
-		commitment_signed_dance!(nodes[2], nodes[3], fail_updates_1.commitment_signed, false);
-
-		expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[2],
-			vec![HTLCDestination::NextHopChannel { node_id: Some(nodes[3].node.get_our_node_id()), channel_id: chan_2_3.2 }]);
-		check_added_monitors!(nodes[2], 1);
-
-		let fail_updates_2 = get_htlc_update_msgs!(nodes[2], nodes[0].node.get_our_node_id());
-		nodes[0].node.handle_update_fail_htlc(&nodes[2].node.get_our_node_id(), &fail_updates_2.update_fail_htlcs[0]);
-		commitment_signed_dance!(nodes[0], nodes[2], fail_updates_2.commitment_signed, false);
-
-		expect_payment_failed_conditions(&nodes[0], payment_hash, true, PaymentFailedConditions::new().mpp_parts_remain());
-	}
-}
-
-#[test]
-fn test_mpp_keysend() {
-	do_test_mpp_keysend(true);
-}
-
-#[test]
-fn test_mpp_keysend_fail() {
-	do_test_mpp_keysend(false);
+	let ev = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
+	pass_along_path(&nodes[0], expected_route[1], recv_value, payment_hash.clone(),
+		Some(payment_secret), ev.clone(), true, Some(payment_preimage));
+	claim_payment_along_route(&nodes[0], expected_route, false, payment_preimage);
 }
 
 #[test]