mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 07:17:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename variables referring to PaymentClaimable

Browse source
This commit is contained in:
Elias Rohrer 2022-12-06 10:47:07 +01:00
parent f4ab077a69
commit e09ca27c71
No known key found for this signature in database
GPG key ID: 36153082BDF676FD
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lightning/src/ln/channelmanager.rs
View file

@ -3476,7 +3476,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
macro_rules! check_total_value { macro_rules! check_total_value {
($payment_data: expr, $payment_preimage: expr) => {{ ($payment_data: expr, $payment_preimage: expr) => {{
let mut payment_received_generated = false; let mut payment_claimable_generated = false;
let purpose = || { let purpose = || {
events::PaymentPurpose::InvoicePayment { events::PaymentPurpose::InvoicePayment {
payment_preimage: $payment_preimage, payment_preimage: $payment_preimage,
@ -3523,14 +3523,14 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
via_channel_id: Some(prev_channel_id), via_channel_id: Some(prev_channel_id),
via_user_channel_id: Some(prev_user_channel_id), via_user_channel_id: Some(prev_user_channel_id),
}); });
payment_received_generated = true; payment_claimable_generated = true;
} else { } else {
// Nothing to do - we haven't reached the total // Nothing to do - we haven't reached the total
// payment value yet, wait until we receive more // payment value yet, wait until we receive more
// MPP parts. // MPP parts.
htlcs.push(claimable_htlc); htlcs.push(claimable_htlc);
} }
payment_received_generated payment_claimable_generated
}} }}
} }
@ -3593,8 +3593,8 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
log_bytes!(payment_hash.0), payment_data.total_msat, inbound_payment.get().min_value_msat.unwrap()); log_bytes!(payment_hash.0), payment_data.total_msat, inbound_payment.get().min_value_msat.unwrap());
fail_htlc!(claimable_htlc, payment_hash); fail_htlc!(claimable_htlc, payment_hash);
} else { } else {
let payment_received_generated = check_total_value!(payment_data, inbound_payment.get().payment_preimage); let payment_claimable_generated = check_total_value!(payment_data, inbound_payment.get().payment_preimage);
if payment_received_generated { if payment_claimable_generated {
inbound_payment.remove_entry(); inbound_payment.remove_entry();
} }
} }

8
lightning/src/ln/functional_test_utils.rs
View file

@ -1756,7 +1756,7 @@ pub fn send_along_route_with_secret<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>,
payment_id payment_id
} }
pub fn do_pass_along_path<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_path: &[&Node<'a, 'b, 'c>], recv_value: u64, our_payment_hash: PaymentHash, our_payment_secret: Option<PaymentSecret>, ev: MessageSendEvent, payment_received_expected: bool, clear_recipient_events: bool, expected_preimage: Option<PaymentPreimage>) { pub fn do_pass_along_path<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_path: &[&Node<'a, 'b, 'c>], recv_value: u64, our_payment_hash: PaymentHash, our_payment_secret: Option<PaymentSecret>, ev: MessageSendEvent, payment_claimable_expected: bool, clear_recipient_events: bool, expected_preimage: Option<PaymentPreimage>) {
let mut payment_event = SendEvent::from_event(ev); let mut payment_event = SendEvent::from_event(ev);
let mut prev_node = origin_node; let mut prev_node = origin_node;
@ -1771,7 +1771,7 @@ pub fn do_pass_along_path<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_p
if idx == expected_path.len() - 1 && clear_recipient_events { if idx == expected_path.len() - 1 && clear_recipient_events {
let events_2 = node.node.get_and_clear_pending_events(); let events_2 = node.node.get_and_clear_pending_events();
if payment_received_expected { if payment_claimable_expected {
assert_eq!(events_2.len(), 1); assert_eq!(events_2.len(), 1);
match events_2[0] { match events_2[0] {
Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, ref via_channel_id, ref via_user_channel_id } => { Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, ref via_channel_id, ref via_user_channel_id } => {
@ -1808,8 +1808,8 @@ pub fn do_pass_along_path<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_p
} }
} }
pub fn pass_along_path<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_path: &[&Node<'a, 'b, 'c>], recv_value: u64, our_payment_hash: PaymentHash, our_payment_secret: Option<PaymentSecret>, ev: MessageSendEvent, payment_received_expected: bool, expected_preimage: Option<PaymentPreimage>) { pub fn pass_along_path<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_path: &[&Node<'a, 'b, 'c>], recv_value: u64, our_payment_hash: PaymentHash, our_payment_secret: Option<PaymentSecret>, ev: MessageSendEvent, payment_claimable_expected: bool, expected_preimage: Option<PaymentPreimage>) {
do_pass_along_path(origin_node, expected_path, recv_value, our_payment_hash, our_payment_secret, ev, payment_received_expected, true, expected_preimage); do_pass_along_path(origin_node, expected_path, recv_value, our_payment_hash, our_payment_secret, ev, payment_claimable_expected, true, expected_preimage);
} }
pub fn pass_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&[&Node<'a, 'b, 'c>]], recv_value: u64, our_payment_hash: PaymentHash, our_payment_secret: PaymentSecret) { pub fn pass_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&[&Node<'a, 'b, 'c>]], recv_value: u64, our_payment_hash: PaymentHash, our_payment_secret: PaymentSecret) {