Ensure payment_params present when checking is_retryable_now

Author: valentinewallace

lightning/src/ln/outbound_payment.rs

@@ -79,7 +79,9 @@ impl PendingOutboundPayment {
 	}
 	fn is_auto_retryable_now(&self) -> bool {
 		match self {
-			PendingOutboundPayment::Retryable { retry_strategy: Some(strategy), attempts, .. } => {
+			PendingOutboundPayment::Retryable {
+				retry_strategy: Some(strategy), attempts, payment_params: Some(_), ..
+			} => {
 				strategy.is_retryable_now(&attempts)
 			},
 			_ => false,
@@ -516,11 +518,12 @@ impl OutboundPayments {
 			let mut retry_id_route_params = None;
 			for (pmt_id, pmt) in outbounds.iter_mut() {
 				if pmt.is_auto_retryable_now() {
-					if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), .. } = pmt {
+					if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params, .. } = pmt {
+						let params = if let Some(p) = payment_params { p.clone() } else { debug_assert!(false); continue };
 						if pending_amt_msat < total_msat {
 							retry_id_route_params = Some((*pmt_id, RouteParameters {
 								final_value_msat: *total_msat - *pending_amt_msat,
-								payment_params: params.clone(),
+								payment_params: params,
 							}));
 							break
 						}