f - return early in mark_abandoned if already abandoned

Author: alecchendev

lightning/src/ln/outbound_payment.rs

@@ -148,20 +148,21 @@ impl PendingOutboundPayment {
 	}
 
 	fn mark_abandoned(&mut self, reason: PaymentFailureReason) -> Result<(), ()> {
-		let mut session_privs = HashSet::new();
-		let our_payment_hash;
-		core::mem::swap(&mut session_privs, match self {
+		match self {
 			PendingOutboundPayment::Legacy { .. } |
-			PendingOutboundPayment::Fulfilled { .. } =>
-				return Err(()),
-			PendingOutboundPayment::Retryable { session_privs, payment_hash, .. } |
-			PendingOutboundPayment::Abandoned { session_privs, payment_hash, .. } => {
-				our_payment_hash = *payment_hash;
-				session_privs
+			PendingOutboundPayment::Fulfilled { .. } => Err(()),
+			PendingOutboundPayment::Retryable { session_privs, payment_hash, .. } => {
+				let mut our_session_privs = HashSet::new();
+				core::mem::swap(&mut our_session_privs, session_privs);
+				*self = PendingOutboundPayment::Abandoned {
+					session_privs: our_session_privs,
+					payment_hash: *payment_hash,
+					reason: Some(reason)
+				};
+				Ok(())
 			},
-		});
-		*self = PendingOutboundPayment::Abandoned { session_privs, payment_hash: our_payment_hash, reason: Some(reason) };
-		Ok(())
+			PendingOutboundPayment::Abandoned { .. } => Ok(()),
+		}
 	}
 
 	/// panics if path is None and !self.is_fulfilled
@@ -548,9 +549,7 @@ impl OutboundPayments {
 		outbounds.retain(|pmt_id, pmt| {
 			let mut retain = true;
 			if !pmt.is_auto_retryable_now() && pmt.remaining_parts() == 0 {
-				if !pmt.abandoned() {
-					let _ = pmt.mark_abandoned(PaymentFailureReason::RetriesExhausted);
-				}
+				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,
@@ -668,9 +667,7 @@ impl OutboundPayments {
 
 		macro_rules! abandon_with_entry {
 			($payment: expr, $reason: expr) => {
-				if !$payment.get().abandoned() {
-					let _ = $payment.get_mut().mark_abandoned($reason);
-				}
+				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 {
@@ -1256,9 +1253,7 @@ impl OutboundPayments {
 	) {
 		let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 		if let hash_map::Entry::Occupied(mut payment) = outbounds.entry(payment_id) {
-			if !payment.get().abandoned() {
-				let _ = payment.get_mut().mark_abandoned(reason);
-			}
+			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 {