f - pull from state when pushing PaymentFailed

Author: alecchendev

lightning/src/ln/outbound_payment.rs

@@ -1182,16 +1182,12 @@ impl OutboundPayments {
 				is_retryable_now = false;
 			}
 			if payment.get().remaining_parts() == 0 {
-				if payment.get().abandoned() {
+				if let PendingOutboundPayment::Abandoned { payment_hash, reason, .. }= payment.get() {
 					if !payment_is_probe {
 						full_failure_ev = Some(events::Event::PaymentFailed {
 							payment_id: *payment_id,
-							payment_hash: payment.get().payment_hash().expect("PendingOutboundPayments::RetriesExceeded always has a payment hash set"),
-							reason: Some(if payment_retryable {
-									PaymentFailureReason::RetriesExhausted
-								} else {
-									PaymentFailureReason::RecipientRejected
-							}),
+							payment_hash: *payment_hash,
+							reason: *reason,
 						});
 					}
 					payment.remove();
@@ -1253,12 +1249,15 @@ impl OutboundPayments {
 	) {
 		let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 		if let hash_map::Entry::Occupied(mut payment) = outbounds.entry(payment_id) {
-			if let Ok(()) = payment.get_mut().mark_abandoned(reason) {
+			if !payment.get().abandoned() {
+				payment.get_mut().mark_abandoned(reason);
+			}
+			if let PendingOutboundPayment::Abandoned { payment_hash, reason, .. } = payment.get() {
 				if payment.get().remaining_parts() == 0 {
 					pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 						payment_id,
-						payment_hash: payment.get().payment_hash().expect("PendingOutboundPayments::RetriesExceeded always has a payment hash set"),
-						reason: Some(reason),
+						payment_hash: *payment_hash,
+						reason: *reason,
 					});
 					payment.remove();
 				}