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

Support fee overpayment by 1 msat in expect_payment_forwarded test util.

Browse source 
See ClaimAlongRouteArgs::allow_1_msat_fee_overpay.
This commit is contained in:
Valentine Wallace 2023-12-24 20:13:28 -05:00
parent 0b22ccd477
commit c30332ac86
No known key found for this signature in database
GPG key ID: FD3E106A2CE099B4
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lightning/src/ln/chanmon_update_fail_tests.rs
View file

@ -3405,7 +3405,7 @@ fn do_test_reload_mon_update_completion_actions(close_during_reload: bool) {
let mut events = nodes[1].node.get_and_clear_pending_events();
assert_eq!(events.len(), if close_during_reload { 2 } else { 1 });
expect_payment_forwarded(events.pop().unwrap(), &nodes[1], &nodes[0], &nodes[2], Some(1000),
None, close_during_reload, false);
None, close_during_reload, false, false);
if close_during_reload {
match events[0] {
Event::ChannelClosed { .. } => {},

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

@ -2223,17 +2223,26 @@ macro_rules! expect_payment_path_successful {
}
}
/// Returns the total fee earned by this HTLC forward, in msat.
pub fn expect_payment_forwarded<CM: AChannelManager, H: NodeHolder<CM=CM>>(
event: Event, node: &H, prev_node: &H, next_node: &H, expected_fee: Option<u64>,
expected_extra_fees_msat: Option<u64>, upstream_force_closed: bool,
downstream_force_closed: bool
) {
downstream_force_closed: bool, allow_1_msat_fee_overpay: bool,
) -> Option<u64> {
match event {
Event::PaymentForwarded {
total_fee_earned_msat, prev_channel_id, claim_from_onchain_tx, next_channel_id,
outbound_amount_forwarded_msat: _, skimmed_fee_msat
} => {
assert_eq!(total_fee_earned_msat, expected_fee);
if allow_1_msat_fee_overpay {
// Aggregating fees for blinded paths may result in a rounding error, causing slight
// overpayment in fees.
let actual_fee = total_fee_earned_msat.unwrap();
let expected_fee = expected_fee.unwrap();
assert!(actual_fee == expected_fee || actual_fee == expected_fee + 1);
} else {
assert_eq!(total_fee_earned_msat, expected_fee);
}
// Check that the (knowingly) withheld amount is always less or equal to the expected
// overpaid amount.
@ -2248,6 +2257,7 @@ pub fn expect_payment_forwarded<CM: AChannelManager, H: NodeHolder<CM=CM>>(
assert!(node.node().list_channels().iter().any(|x| x.counterparty.node_id == next_node.node().get_our_node_id() && x.channel_id == next_channel_id.unwrap()));
}
assert_eq!(claim_from_onchain_tx, downstream_force_closed);
total_fee_earned_msat
},
_ => panic!("Unexpected event"),
}
@ -2260,7 +2270,7 @@ macro_rules! expect_payment_forwarded {
assert_eq!(events.len(), 1);
$crate::ln::functional_test_utils::expect_payment_forwarded(
events.pop().unwrap(), &$node, &$prev_node, &$next_node, $expected_fee, None,
$upstream_force_closed, $downstream_force_closed
$upstream_force_closed, $downstream_force_closed, false
);
}
}
@ -2814,7 +2824,7 @@ pub fn pass_claimed_payment_along_route<'a, 'b, 'c, 'd>(args: ClaimAlongRouteArg
let mut events = $node.node.get_and_clear_pending_events();
assert_eq!(events.len(), 1);
expect_payment_forwarded(events.pop().unwrap(), *$node, $next_node, $prev_node,
Some(fee as u64), expected_extra_fee, false, false);
Some(fee as u64), expected_extra_fee, false, false, false);
expected_total_fee_msat += fee as u64;
fwd_amt_msat += fee as u64;
check_added_monitors!($node, 1);