f - pull from state when pushing PaymentFailed

Author: alecchendev

lightning/src/ln/outbound_payment.rs

@@ -548,12 +548,14 @@ impl OutboundPayments {
 		outbounds.retain(|pmt_id, pmt| {
 			let mut retain = true;
 			if !pmt.is_auto_retryable_now() && pmt.remaining_parts() == 0 {
-				let reason = PaymentFailureReason::RetriesExhausted;
-				if pmt.mark_abandoned(reason).is_ok() {
+				if !pmt.abandoned() {
+					let _ = pmt.mark_abandoned(PaymentFailureReason::RetriesExhausted);
+				}
+				if let PendingOutboundPayment::Abandoned { payment_hash, reason, .. } = pmt {
 					pending_events.lock().unwrap().push(events::Event::PaymentFailed {
 						payment_id: *pmt_id,
-						payment_hash: pmt.payment_hash().expect("PendingOutboundPayments::Retryable always has a payment hash set"),
-						reason: Some(reason),
+						payment_hash: *payment_hash,
+						reason: *reason,
 					});
 					retain = false;
 				}
@@ -666,13 +668,18 @@ impl OutboundPayments {
 
 		macro_rules! abandon_with_entry {
 			($payment: expr, $reason: expr) => {
-				if $payment.get_mut().mark_abandoned($reason).is_ok() && $payment.get().remaining_parts() == 0 {
-					pending_events.lock().unwrap().push(events::Event::PaymentFailed {
-						payment_id,
-						payment_hash,
-						reason: Some($reason),
-					});
-					$payment.remove();
+				if !$payment.get().abandoned() {
+					let _ = $payment.get_mut().mark_abandoned($reason);
+				}
+				if let PendingOutboundPayment::Abandoned { reason, .. } = $payment.get() {
+					if $payment.get().remaining_parts() == 0 {
+						pending_events.lock().unwrap().push(events::Event::PaymentFailed {
+							payment_id,
+							payment_hash,
+							reason: *reason,
+						});
+						$payment.remove();
+					}
 				}
 			}
 		}
@@ -1182,16 +1189,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 +1256,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() {
+				let _ = 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();
 				}