f auto_retry_partial_failure test

Author: tnull

lightning/src/ln/payment_tests.rs

@@ -2395,10 +2395,11 @@ fn auto_retry_partial_failure() {
 	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV)
 		.with_expiry_time(payment_expiry_secs as u64)
 		.with_bolt11_features(invoice_features).unwrap();
+
+	// Configure the initial send path
 	let mut route_params = RouteParameters::from_payment_params_and_value(payment_params, amt_msat);
 	route_params.max_total_routing_fee_msat = None;
 
-	// Configure the initial send, retry1 and retry2's paths.
 	let send_route = Route {
 		paths: vec![
 			Path { hops: vec![RouteHop {
@@ -2422,6 +2423,14 @@ fn auto_retry_partial_failure() {
 		],
 		route_params: Some(route_params.clone()),
 	};
+	nodes[0].router.expect_find_route(route_params.clone(), Ok(send_route));
+
+	// Configure the retry1 paths
+	let mut payment_params = route_params.payment_params.clone();
+	payment_params.previously_failed_channels.push(chan_2_id);
+	let mut retry_1_params = RouteParameters::from_payment_params_and_value(payment_params, amt_msat / 2);
+	retry_1_params.max_total_routing_fee_msat = None;
+
 	let retry_1_route = Route {
 		paths: vec![
 			Path { hops: vec![RouteHop {
@@ -2443,8 +2452,16 @@ fn auto_retry_partial_failure() {
 				maybe_announced_channel: true,
 			}], blinded_tail: None },
 		],
-		route_params: Some(route_params.clone()),
+		route_params: Some(retry_1_params.clone()),
 	};
+	nodes[0].router.expect_find_route(retry_1_params.clone(), Ok(retry_1_route));
+
+	// Configure the retry2 path
+	let mut payment_params = retry_1_params.payment_params.clone();
+	payment_params.previously_failed_channels.push(chan_3_id);
+	let mut retry_2_params = RouteParameters::from_payment_params_and_value(payment_params, amt_msat / 4);
+	retry_2_params.max_total_routing_fee_msat = None;
+
 	let retry_2_route = Route {
 		paths: vec![
 			Path { hops: vec![RouteHop {
@@ -2457,20 +2474,8 @@ fn auto_retry_partial_failure() {
 				maybe_announced_channel: true,
 			}], blinded_tail: None },
 		],
-		route_params: Some(route_params.clone()),
+		route_params: Some(retry_2_params.clone()),
 	};
-	nodes[0].router.expect_find_route(route_params.clone(), Ok(send_route));
-	let mut payment_params = route_params.payment_params.clone();
-	payment_params.previously_failed_channels.push(chan_2_id);
-
-	let mut retry_1_params = RouteParameters::from_payment_params_and_value(payment_params, amt_msat / 2);
-	retry_1_params.max_total_routing_fee_msat = None;
-	nodes[0].router.expect_find_route(retry_1_params, Ok(retry_1_route));
-
-	let mut payment_params = route_params.payment_params.clone();
-	payment_params.previously_failed_channels.push(chan_3_id);
-	let mut retry_2_params = RouteParameters::from_payment_params_and_value(payment_params, amt_msat / 4);
-	retry_2_params.max_total_routing_fee_msat = None;
 	nodes[0].router.expect_find_route(retry_2_params, Ok(retry_2_route));
 
 	// Send a payment that will partially fail on send, then partially fail on retry, then succeed.