f - remove return value from PendingOutboundPayment::mark_abandoned

Author: alecchendev

lightning/src/ln/outbound_payment.rs

@@ -147,21 +147,15 @@ impl PendingOutboundPayment {
 		*self = PendingOutboundPayment::Fulfilled { session_privs, payment_hash, timer_ticks_without_htlcs: 0 };
 	}
 
-	fn mark_abandoned(&mut self, reason: PaymentFailureReason) -> Result<(), ()> {
-		match self {
-			PendingOutboundPayment::Legacy { .. } |
-			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(())
-			},
-			PendingOutboundPayment::Abandoned { .. } => Ok(()),
+	fn mark_abandoned(&mut self, reason: PaymentFailureReason) {
+		if let PendingOutboundPayment::Retryable { session_privs, payment_hash, .. } = self {
+			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)
+			};
 		}
 	}
 
@@ -591,7 +585,7 @@ impl OutboundPayments {
 		outbounds.retain(|pmt_id, pmt| {
 			let mut retain = true;
 			if !pmt.is_auto_retryable_now() && pmt.remaining_parts() == 0 {
-				let _ = pmt.mark_abandoned(PaymentFailureReason::RetriesExhausted);
+				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,
@@ -709,7 +703,7 @@ impl OutboundPayments {
 
 		macro_rules! abandon_with_entry {
 			($payment: expr, $reason: expr) => {
-				let _ = $payment.get_mut().mark_abandoned($reason);
+				$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 {
@@ -1232,7 +1226,7 @@ impl OutboundPayments {
 				} else {
 					PaymentFailureReason::RetriesExhausted
 				};
-				let _ = payment.get_mut().mark_abandoned(reason); // we'll only Err if it's a legacy payment
+				payment.get_mut().mark_abandoned(reason);
 				is_retryable_now = false;
 			}
 			if payment.get().remaining_parts() == 0 {
@@ -1303,7 +1297,7 @@ impl OutboundPayments {
 	) {
 		let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 		if let hash_map::Entry::Occupied(mut payment) = outbounds.entry(payment_id) {
-			let _ = payment.get_mut().mark_abandoned(reason);
+			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 {