When processing pending htlcs, abandon outbounds that are not retryable

Author: valentinewallace

lightning/src/ln/outbound_payment.rs

@@ -505,10 +505,12 @@ impl OutboundPayments {
 		loop {
 			let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 			let mut retry_id_route_params = None;
-			for (pmt_id, pmt) in outbounds.iter_mut() {
-				if pmt.is_auto_retryable_now() {
-					if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), .. } = pmt {
-						if pending_amt_msat < total_msat {
+			outbounds.retain(|pmt_id, pmt| {
+				let mut retain = true;
+				let auto_retryable = pmt.is_auto_retryable_now();
+				if let PendingOutboundPayment::Retryable { pending_amt_msat, total_msat, payment_params: Some(params), .. } = pmt {
+					if pending_amt_msat < total_msat {
+						if auto_retryable {
 							retry_id_route_params = Some((*pmt_id, RouteParameters {
 								final_value_msat: *total_msat - *pending_amt_msat,
 								final_cltv_expiry_delta:
@@ -517,13 +519,19 @@ impl OutboundPayments {
 										debug_assert!(false, "We always set the final_cltv_expiry_delta when a path fails");
 										LDK_DEFAULT_MIN_FINAL_CLTV_EXPIRY_DELTA.into()
 									},
-								payment_params: params.clone(),
+									payment_params: params.clone(),
 							}));
-							break
+						} else if pmt.mark_abandoned().is_ok() && pmt.remaining_parts() == 0 {
+							pending_events.lock().unwrap().push(events::Event::PaymentFailed {
+								payment_id: *pmt_id,
+								payment_hash: pmt.payment_hash().expect("PendingOutboundPayments::RetriesExceeded always has a payment hash set"),
+							});
+							retain = false;
 						}
 					}
 				}
-			}
+				retain
+			});
 			core::mem::drop(outbounds);
 			if let Some((payment_id, route_params)) = retry_id_route_params {
 				if let Err(e) = self.pay_internal(payment_id, None, route_params, router, first_hops(), inflight_htlcs(), entropy_source, node_signer, best_block_height, logger, &send_payment_along_path) {

lightning/src/ln/payment_tests.rs

@@ -1682,7 +1682,6 @@ fn do_automatic_retries(test: AutoRetry) {
 			let mut msg_events = nodes[0].node.get_and_clear_pending_msg_events();
 			assert_eq!(msg_events.len(), 0);
 
-			nodes[0].node.abandon_payment(PaymentId(payment_hash.0));
 			let mut events = nodes[0].node.get_and_clear_pending_events();
 			assert_eq!(events.len(), 1);
 			match events[0] {
@@ -1717,7 +1716,6 @@ fn do_automatic_retries(test: AutoRetry) {
 		let mut msg_events = nodes[0].node.get_and_clear_pending_msg_events();
 		assert_eq!(msg_events.len(), 0);
 
-		nodes[0].node.abandon_payment(PaymentId(payment_hash.0));
 		let mut events = nodes[0].node.get_and_clear_pending_events();
 		assert_eq!(events.len(), 1);
 		match events[0] {