f Also trigger processing when retries are needed

Author: tnull

lightning/src/ln/channelmanager.rs

@@ -6322,8 +6322,9 @@ where
 	pub fn is_pending_htlc_processing(&self) -> bool {
 		let has_forward_htlcs = !self.forward_htlcs.lock().unwrap().is_empty();
 		let has_decode_update_add_htlcs = !self.decode_update_add_htlcs.lock().unwrap().is_empty();
-		let has_outbound_needing_abandon = self.pending_outbound_payments.needs_abandon();
-		has_forward_htlcs || has_decode_update_add_htlcs || has_outbound_needing_abandon
+		let has_outbound_needing_abandon_or_retry =
+			self.pending_outbound_payments.needs_abandon_or_retry();
+		has_forward_htlcs || has_decode_update_add_htlcs || has_outbound_needing_abandon_or_retry
 	}
 
 	/// Processes HTLCs which are pending waiting on random forward delay.

lightning/src/ln/outbound_payment.rs

@@ -1318,13 +1318,14 @@ impl OutboundPayments {
 		});
 	}
 
-	pub(super) fn needs_abandon(&self) -> bool {
+	pub(super) fn needs_abandon_or_retry(&self) -> bool {
 		let outbounds = self.pending_outbound_payments.lock().unwrap();
 		outbounds.iter().any(|(_, pmt)| {
-			!pmt.is_auto_retryable_now()
-				&& pmt.remaining_parts() == 0
-				&& !pmt.is_fulfilled()
-				&& !pmt.is_awaiting_invoice()
+			pmt.is_auto_retryable_now()
+				|| !pmt.is_auto_retryable_now()
+					&& pmt.remaining_parts() == 0
+					&& !pmt.is_fulfilled()
+					&& !pmt.is_awaiting_invoice()
 		})
 	}