When processing pending htlcs, abandon outbounds that are not retryable

Author: valentinewallace

lightning/src/ln/outbound_payment.rs

@@ -536,6 +536,21 @@ impl OutboundPayments {
 				}
 			} else { break }
 		}
+
+		let mut outbounds = self.pending_outbound_payments.lock().unwrap();
+		outbounds.retain(|pmt_id, pmt| {
+			let mut retain = true;
+			if !pmt.is_auto_retryable_now() && pmt.remaining_parts() == 0 {
+				if pmt.mark_abandoned().is_ok() {
+					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"),
+					});
+					retain = false;
+				}
+			}
+			retain
+		});
 	}
 
 	/// Will return `Ok(())` iff at least one HTLC is sent for the payment.

lightning/src/ln/payment_tests.rs

@@ -1729,7 +1729,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] {
@@ -1764,7 +1763,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] {