Move StaticInvoice outbounds out of map before converting to Retryable.

This will allow us to avoid cloning the invoice request when we move it into
the new Retryable entry in the next commit.

Author: valentinewallace

lightning/src/ln/outbound_payment.rs

@@ -1289,20 +1289,19 @@ impl OutboundPayments {
 							debug_assert!(false);
 							return
 						},
-						PendingOutboundPayment::StaticInvoiceReceived {
-							payment_hash, keysend_preimage, retry_strategy, ..
-						} => {
-							let keysend_preimage = Some(*keysend_preimage);
+						PendingOutboundPayment::StaticInvoiceReceived { .. } => {
+							let PendingOutboundPayment::StaticInvoiceReceived {
+								payment_hash, keysend_preimage, retry_strategy, ..
+							} = payment.remove() else { debug_assert!(false); return };
 							let total_amount = route_params.final_value_msat;
 							let recipient_onion = RecipientOnionFields::spontaneous_empty();
-							let retry_strategy = Some(*retry_strategy);
 							let payment_params = Some(route_params.payment_params.clone());
 							let (retryable_payment, onion_session_privs) = self.create_pending_payment(
-								*payment_hash, recipient_onion.clone(), keysend_preimage, &route,
-								retry_strategy, payment_params, entropy_source, best_block_height
+								payment_hash, recipient_onion.clone(), Some(keysend_preimage), &route,
+								Some(retry_strategy), payment_params, entropy_source, best_block_height
 							);
-							*payment.into_mut() = retryable_payment;
-							(total_amount, recipient_onion, keysend_preimage, onion_session_privs)
+							outbounds.insert(payment_id, retryable_payment);
+							(total_amount, recipient_onion, Some(keysend_preimage), onion_session_privs)
 						},
 						PendingOutboundPayment::Fulfilled { .. } => {
 							log_error!(logger, "Payment already completed");