f pass payment hash rather than expect'ing it

Author: valentinewallace

lightning/src/ln/outbound_payment.rs

@@ -664,11 +664,11 @@ impl OutboundPayments {
 		}
 
 		macro_rules! abandon_with_entry {
-			($payment_id: expr, $payment: expr, $pending_events: expr) => {
+			($payment_id: expr, $payment_hash: expr, $payment: expr, $pending_events: expr) => {
 				if $payment.get_mut().mark_abandoned().is_ok() && $payment.get().remaining_parts() == 0 {
 					$pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 						payment_id: $payment_id,
-						payment_hash: $payment.get().payment_hash().expect("PendingOutboundPayments::RetriesExceeded always has a payment hash set"),
+						payment_hash: $payment_hash,
 					});
 					$payment.remove();
 				}
@@ -678,14 +678,15 @@ impl OutboundPayments {
 			let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 			match outbounds.entry(payment_id) {
 				hash_map::Entry::Occupied(mut payment) => {
-					let res = match payment.get_mut() {
+					let res = match payment.get() {
 						PendingOutboundPayment::Retryable {
 							total_msat, payment_hash, keysend_preimage, payment_secret, pending_amt_msat, ..
 						} => {
 							let retry_amt_msat: u64 = route.paths.iter().map(|path| path.last().unwrap().fee_msat).sum();
 							if retry_amt_msat + *pending_amt_msat > *total_msat * (100 + RETRY_OVERFLOW_PERCENTAGE) / 100 {
 								log_error!(logger, "retry_amt_msat of {} will put pending_amt_msat (currently: {}) more than 10% over total_payment_amt_msat of {}", retry_amt_msat, pending_amt_msat, total_msat);
-								abandon_with_entry!(payment_id, payment, pending_events);
+								let payment_hash = *payment_hash;
+								abandon_with_entry!(payment_id, payment_hash, payment, pending_events);
 								return
 							}
 							(*total_msat, *payment_hash, *payment_secret, *keysend_preimage)
@@ -705,7 +706,7 @@ impl OutboundPayments {
 					};
 					if !payment.get().is_retryable_now() {
 						log_error!(logger, "Retries exhausted for payment id {}", log_bytes!(payment_id.0));
-						abandon_with_entry!(payment_id, payment, pending_events);
+						abandon_with_entry!(payment_id, res.1, payment, pending_events);
 						return
 					}
 					payment.get_mut().increment_attempts();