X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Foutbound_payment.rs;h=67d90d2dbf8922496d04e7fa61cb8706d247dd48;hb=6d0c5f00ba315981e83994774dc50c5c31d4e5ae;hp=f60bf565efa35ddadac28416f2a7da22233d4892;hpb=61d896d5193bad813ce53cc823e9f2afa17e09a8;p=rust-lightning

diff --git a/lightning/src/ln/outbound_payment.rs b/lightning/src/ln/outbound_payment.rs
index f60bf565..67d90d2d 100644
--- a/lightning/src/ln/outbound_payment.rs
+++ b/lightning/src/ln/outbound_payment.rs
@@ -976,7 +976,7 @@ impl OutboundPayments {
 			}))
 		}
 
-		let route = Route { paths: vec![path], payment_params: None };
+		let route = Route { paths: vec![path], route_params: None };
 		let onion_session_privs = self.add_new_pending_payment(payment_hash,
 			RecipientOnionFields::spontaneous_empty(), payment_id, None, &route, None, None,
 			entropy_source, best_block_height)?;
@@ -1145,9 +1145,9 @@ impl OutboundPayments {
 				results,
 				payment_id,
 				failed_paths_retry: if pending_amt_unsent != 0 {
-					if let Some(payment_params) = &route.payment_params {
+					if let Some(payment_params) = route.route_params.as_ref().map(|p| p.payment_params.clone()) {
 						Some(RouteParameters {
-							payment_params: payment_params.clone(),
+							payment_params: payment_params,
 							final_value_msat: pending_amt_unsent,
 						})
 					} else { None }
@@ -1565,14 +1565,11 @@ mod tests {
 				PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap()),
 				0
 			).with_expiry_time(past_expiry_time);
-		let expired_route_params = RouteParameters {
-			payment_params,
-			final_value_msat: 0,
-		};
+		let expired_route_params = RouteParameters::from_payment_params_and_value(payment_params, 0);
 		let pending_events = Mutex::new(VecDeque::new());
 		if on_retry {
 			outbound_payments.add_new_pending_payment(PaymentHash([0; 32]), RecipientOnionFields::spontaneous_empty(),
-				PaymentId([0; 32]), None, &Route { paths: vec![], payment_params: None },
+				PaymentId([0; 32]), None, &Route { paths: vec![], route_params: None },
 				Some(Retry::Attempts(1)), Some(expired_route_params.payment_params.clone()),
 				&&keys_manager, 0).unwrap();
 			outbound_payments.retry_payment_internal(
@@ -1609,17 +1606,14 @@ mod tests {
 
 		let payment_params = PaymentParameters::from_node_id(
 			PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap()), 0);
-		let route_params = RouteParameters {
-			payment_params,
-			final_value_msat: 0,
-		};
+		let route_params = RouteParameters::from_payment_params_and_value(payment_params, 0);
 		router.expect_find_route(route_params.clone(),
 			Err(LightningError { err: String::new(), action: ErrorAction::IgnoreError }));
 
 		let pending_events = Mutex::new(VecDeque::new());
 		if on_retry {
 			outbound_payments.add_new_pending_payment(PaymentHash([0; 32]), RecipientOnionFields::spontaneous_empty(),
-				PaymentId([0; 32]), None, &Route { paths: vec![], payment_params: None },
+				PaymentId([0; 32]), None, &Route { paths: vec![], route_params: None },
 				Some(Retry::Attempts(1)), Some(route_params.payment_params.clone()),
 				&&keys_manager, 0).unwrap();
 			outbound_payments.retry_payment_internal(
@@ -1652,10 +1646,7 @@ mod tests {
 		let sender_pk = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap());
 		let receiver_pk = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[43; 32]).unwrap());
 		let payment_params = PaymentParameters::from_node_id(sender_pk, 0);
-		let route_params = RouteParameters {
-			payment_params: payment_params.clone(),
-			final_value_msat: 0,
-		};
+		let route_params = RouteParameters::from_payment_params_and_value(payment_params.clone(), 0);
 		let failed_scid = 42;
 		let route = Route {
 			paths: vec![Path { hops: vec![RouteHop {
@@ -1666,7 +1657,7 @@ mod tests {
 				fee_msat: 0,
 				cltv_expiry_delta: 0,
 			}], blinded_tail: None }],
-			payment_params: Some(payment_params),
+			route_params: Some(route_params.clone()),
 		};
 		router.expect_find_route(route_params.clone(), Ok(route.clone()));
 		let mut route_params_w_failed_scid = route_params.clone();