mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-24 23:08:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove pending probes on update_fail

Browse source 
Previously we had a memory leak where probes would not be removed from
outbound_payments on htlc fail
This commit is contained in:
Valentine Wallace 2023-02-15 17:30:47 -05:00
parent 30b9d9fbea
commit a2b956d46e
No known key found for this signature in database
GPG key ID: FD3E106A2CE099B4
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lightning/src/ln/outbound_payment.rs
View file

@ -1062,17 +1062,19 @@ impl OutboundPayments {
}); });
} }
if !payment_is_probe && (!is_retryable_now || !payment_retryable || retry.is_none()) { if payment_is_probe || !is_retryable_now || !payment_retryable || retry.is_none() {
let _ = payment.get_mut().mark_abandoned(); // we'll only Err if it's a legacy payment let _ = payment.get_mut().mark_abandoned(); // we'll only Err if it's a legacy payment
is_retryable_now = false; is_retryable_now = false;
} }
if payment.get().remaining_parts() == 0 { if payment.get().remaining_parts() == 0 {
all_paths_failed = true; all_paths_failed = true;
if payment.get().abandoned() { if payment.get().abandoned() {
full_failure_ev = Some(events::Event::PaymentFailed { if !payment_is_probe {
payment_id: *payment_id, full_failure_ev = Some(events::Event::PaymentFailed {
payment_hash: payment.get().payment_hash().expect("PendingOutboundPayments::RetriesExceeded always has a payment hash set"), payment_id: *payment_id,
}); payment_hash: payment.get().payment_hash().expect("PendingOutboundPayments::RetriesExceeded always has a payment hash set"),
});
}
payment.remove(); payment.remove();
} }
} }

3
lightning/src/ln/payment_tests.rs
View file

@ -941,6 +941,7 @@ fn successful_probe_yields_event() {
}, },
_ => panic!(), _ => panic!(),
}; };
assert!(!nodes[0].node.has_pending_payments());
} }
#[test] #[test]
@ -986,6 +987,7 @@ fn failed_probe_yields_event() {
}, },
_ => panic!(), _ => panic!(),
}; };
assert!(!nodes[0].node.has_pending_payments());
} }
#[test] #[test]
@ -1040,6 +1042,7 @@ fn onchain_failed_probe_yields_event() {
} }
} }
assert!(found_probe_failed); assert!(found_probe_failed);
assert!(!nodes[0].node.has_pending_payments());
} }
#[test] #[test]