temp mpp test mod to have single route

Author: joostjager

lightning/src/ln/payment_tests.rs

@@ -10,7 +10,6 @@
 //! Tests that test the payment retry logic in ChannelManager, including various edge-cases around
 //! serialization ordering between ChannelManager/ChannelMonitors and ensuring we can still retry
 //! payments thereafter.
-
 use crate::chain::channelmonitor::{
 	ANTI_REORG_DELAY, HTLC_FAIL_BACK_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS,
 };
@@ -47,7 +46,7 @@ use crate::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
 use crate::util::errors::APIError;
 use crate::util::ser::Writeable;
 use crate::util::string::UntrustedString;
-use crate::util::test_utils;
+use crate::util::{test_utils};
 
 use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::hashes::Hash;
@@ -493,15 +492,15 @@ fn test_mpp_keysend() {
 	let nodes = create_network(4, &node_cfgs, &node_chanmgrs);
 
 	let node_b_id = nodes[1].node.get_our_node_id();
-	let node_c_id = nodes[2].node.get_our_node_id();
+	// let node_c_id = nodes[2].node.get_our_node_id();
 	let node_d_id = nodes[3].node.get_our_node_id();
 
 	create_announced_chan_between_nodes(&nodes, 0, 1);
-	create_announced_chan_between_nodes(&nodes, 0, 2);
+	// create_announced_chan_between_nodes(&nodes, 0, 2);
 	create_announced_chan_between_nodes(&nodes, 1, 3);
-	create_announced_chan_between_nodes(&nodes, 2, 3);
+	// create_announced_chan_between_nodes(&nodes, 2, 3);
 
-	let recv_value = 15_000_000;
+	let recv_value = 5_000_000;
 	let route_params = RouteParameters::from_payment_params_and_value(
 		PaymentParameters::for_keysend(node_d_id, 40, true),
 		recv_value,
@@ -514,18 +513,18 @@ fn test_mpp_keysend() {
 	let id = PaymentId([42; 32]);
 	let hash =
 		nodes[0].node.send_spontaneous_payment(preimage, onion, id, route_params, retry).unwrap();
-	check_added_monitors!(nodes[0], 2);
+	check_added_monitors!(nodes[0], 1);
 
-	let route: &[&[&Node]] = &[&[&nodes[1], &nodes[3]], &[&nodes[2], &nodes[3]]];
+	let route: &[&[&Node]] = &[&[&nodes[1], &nodes[3]]];
 	let mut events = nodes[0].node.get_and_clear_pending_msg_events();
-	assert_eq!(events.len(), 2);
+	assert_eq!(events.len(), 1);
 
 	let ev = remove_first_msg_event_to_node(&node_b_id, &mut events);
 	let payment_secret = Some(payment_secret);
-	pass_along_path(&nodes[0], route[0], recv_value, hash, payment_secret, ev, false, preimage);
+	pass_along_path(&nodes[0], route[0], recv_value, hash, payment_secret, ev, true, preimage);
+
+	std::thread::sleep(Duration::from_millis(50));
 
-	let ev = remove_first_msg_event_to_node(&node_c_id, &mut events);
-	pass_along_path(&nodes[0], route[1], recv_value, hash, payment_secret, ev, true, preimage);
 	claim_payment_along_route(ClaimAlongRouteArgs::new(&nodes[0], route, preimage.unwrap()));
 }