Skip to content

Commit 3435457

Browse files
ViktorTigerstromViktorTigerstrom
committed
Add counterparty_node to test macros
1 parent fda3819 commit 3435457

File tree

3 files changed

+51
-51
lines changed

3 files changed

+51
-51
lines changed

‎lightning/src/ln/functional_test_utils.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ macro_rules! get_channel_ref {
520520

521521
#[cfg(test)]
522522
macro_rules! get_feerate {
523-
($node: expr, $channel_id: expr) => {
523+
($node: expr, $counterparty_node: expr, $channel_id: expr) => {
524524
{
525525
let mut lock;
526526
let chan = get_channel_ref!($node, lock, $channel_id);
@@ -531,7 +531,7 @@ macro_rules! get_feerate {
531531

532532
#[cfg(test)]
533533
macro_rules! get_opt_anchors {
534-
($node: expr, $channel_id: expr) => {
534+
($node: expr, $counterparty_node: expr, $channel_id: expr) => {
535535
{
536536
let mut lock;
537537
let chan = get_channel_ref!($node, lock, $channel_id);
@@ -2188,7 +2188,7 @@ pub fn get_announce_close_broadcast_events<'a, 'b, 'c>(nodes: &Vec<Node<'a, 'b,
21882188

21892189
#[cfg(test)]
21902190
macro_rules! get_channel_value_stat {
2191-
($node: expr, $channel_id: expr) => {{
2191+
($node: expr, $counterparty_node: expr, $channel_id: expr) => {{
21922192
let chan_lock = $node.node.channel_state.lock().unwrap();
21932193
let chan = chan_lock.by_id.get(&$channel_id).unwrap();
21942194
chan.get_value_stat()

‎lightning/src/ln/functional_tests.rs

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -948,8 +948,8 @@ fn test_update_fee() {
948948
check_added_monitors!(nodes[1], 1);
949949
assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
950950

951-
assert_eq!(get_feerate!(nodes[0], channel_id), feerate + 30);
952-
assert_eq!(get_feerate!(nodes[1], channel_id), feerate + 30);
951+
assert_eq!(get_feerate!(nodes[0], nodes[1], channel_id), feerate + 30);
952+
assert_eq!(get_feerate!(nodes[1], nodes[0], channel_id), feerate + 30);
953953
close_channel(&nodes[0], &nodes[1], &chan.2, chan.3, true);
954954
check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure);
955955
check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure);
@@ -1353,11 +1353,11 @@ fn test_basic_channel_reserve() {
13531353
let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
13541354
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 100000, 95000000, InitFeatures::known(), InitFeatures::known());
13551355

1356-
let chan_stat = get_channel_value_stat!(nodes[0], chan.2);
1356+
let chan_stat = get_channel_value_stat!(nodes[0], nodes[1], chan.2);
13571357
let channel_reserve = chan_stat.channel_reserve_msat;
13581358

13591359
// The 2* and +1 are for the fee spike reserve.
1360-
let commit_tx_fee = 2 * commit_tx_fee_msat(get_feerate!(nodes[0], chan.2), 1 + 1, get_opt_anchors!(nodes[0], chan.2));
1360+
let commit_tx_fee = 2 * commit_tx_fee_msat(get_feerate!(nodes[0], nodes[1], chan.2), 1 + 1, get_opt_anchors!(nodes[0], nodes[1], chan.2));
13611361
let max_can_send = 5000000 - channel_reserve - commit_tx_fee;
13621362
let (route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], max_can_send + 1);
13631363
let err = nodes[0].node.send_payment(&route, our_payment_hash, &Some(our_payment_secret)).err().unwrap();
@@ -1410,7 +1410,7 @@ fn test_fee_spike_violation_fails_htlc() {
14101410
// nodes[0] just sent. In the code for construction of this message, "local" refers
14111411
// to the sender of the message, and "remote" refers to the receiver.
14121412

1413-
let feerate_per_kw = get_feerate!(nodes[0], chan.2);
1413+
let feerate_per_kw = get_feerate!(nodes[0], nodes[1], chan.2);
14141414

14151415
const INITIAL_COMMITMENT_NUMBER: u64 = (1 << 48) - 1;
14161416

@@ -1708,9 +1708,9 @@ fn test_chan_reserve_violation_inbound_htlc_inbound_chan() {
17081708

17091709
let feemsat = 239;
17101710
let total_routing_fee_msat = (nodes.len() - 2) as u64 * feemsat;
1711-
let chan_stat = get_channel_value_stat!(nodes[0], chan.2);
1712-
let feerate = get_feerate!(nodes[0], chan.2);
1713-
let opt_anchors = get_opt_anchors!(nodes[0], chan.2);
1711+
let chan_stat = get_channel_value_stat!(nodes[0], nodes[1], chan.2);
1712+
let feerate = get_feerate!(nodes[0], nodes[1], chan.2);
1713+
let opt_anchors = get_opt_anchors!(nodes[0], nodes[1], chan.2);
17141714

17151715
// Add a 2* and +1 for the fee spike reserve.
17161716
let commit_tx_fee_2_htlc = 2*commit_tx_fee_msat(feerate, 2 + 1, opt_anchors);
@@ -1798,11 +1798,11 @@ fn test_channel_reserve_holding_cell_htlcs() {
17981798
let chan_1 = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 190000, 1001, InitFeatures::known(), InitFeatures::known());
17991799
let chan_2 = create_announced_chan_between_nodes_with_value(&nodes, 1, 2, 190000, 1001, InitFeatures::known(), InitFeatures::known());
18001800

1801-
let mut stat01 = get_channel_value_stat!(nodes[0], chan_1.2);
1802-
let mut stat11 = get_channel_value_stat!(nodes[1], chan_1.2);
1801+
let mut stat01 = get_channel_value_stat!(nodes[0], nodes[1], chan_1.2);
1802+
let mut stat11 = get_channel_value_stat!(nodes[1], nodes[0], chan_1.2);
18031803

1804-
let mut stat12 = get_channel_value_stat!(nodes[1], chan_2.2);
1805-
let mut stat22 = get_channel_value_stat!(nodes[2], chan_2.2);
1804+
let mut stat12 = get_channel_value_stat!(nodes[1], nodes[2], chan_2.2);
1805+
let mut stat22 = get_channel_value_stat!(nodes[2], nodes[1], chan_2.2);
18061806

18071807
macro_rules! expect_forward {
18081808
($node: expr) => {{
@@ -1816,8 +1816,8 @@ fn test_channel_reserve_holding_cell_htlcs() {
18161816

18171817
let feemsat = 239; // set above
18181818
let total_fee_msat = (nodes.len() - 2) as u64 * feemsat;
1819-
let feerate = get_feerate!(nodes[0], chan_1.2);
1820-
let opt_anchors = get_opt_anchors!(nodes[0], chan_1.2);
1819+
let feerate = get_feerate!(nodes[0], nodes[1], chan_1.2);
1820+
let opt_anchors = get_opt_anchors!(nodes[0], nodes[1], chan_1.2);
18211821

18221822
let recv_value_0 = stat01.counterparty_max_htlc_value_in_flight_msat - total_fee_msat;
18231823

@@ -1847,10 +1847,10 @@ fn test_channel_reserve_holding_cell_htlcs() {
18471847
send_payment(&nodes[0], &vec![&nodes[1], &nodes[2]][..], recv_value_0);
18481848

18491849
let (stat01_, stat11_, stat12_, stat22_) = (
1850-
get_channel_value_stat!(nodes[0], chan_1.2),
1851-
get_channel_value_stat!(nodes[1], chan_1.2),
1852-
get_channel_value_stat!(nodes[1], chan_2.2),
1853-
get_channel_value_stat!(nodes[2], chan_2.2),
1850+
get_channel_value_stat!(nodes[0], nodes[1], chan_1.2),
1851+
get_channel_value_stat!(nodes[1], nodes[0], chan_1.2),
1852+
get_channel_value_stat!(nodes[1], nodes[2], chan_2.2),
1853+
get_channel_value_stat!(nodes[2], nodes[1], chan_2.2),
18541854
);
18551855

18561856
assert_eq!(stat01_.value_to_self_msat, stat01.value_to_self_msat - amt_msat);
@@ -1901,7 +1901,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
19011901
let recv_value_21 = recv_value_2/2 - additional_htlc_cost_msat/2;
19021902
let recv_value_22 = recv_value_2 - recv_value_21 - total_fee_msat - additional_htlc_cost_msat;
19031903
{
1904-
let stat = get_channel_value_stat!(nodes[0], chan_1.2);
1904+
let stat = get_channel_value_stat!(nodes[0], nodes[1], chan_1.2);
19051905
assert_eq!(stat.value_to_self_msat - (stat.pending_outbound_htlcs_amount_msat + recv_value_21 + recv_value_22 + total_fee_msat + total_fee_msat + commit_tx_fee_3_htlcs), stat.channel_reserve_msat);
19061906
}
19071907

@@ -2013,11 +2013,11 @@ fn test_channel_reserve_holding_cell_htlcs() {
20132013

20142014
let commit_tx_fee_1_htlc = 2*commit_tx_fee_msat(feerate, 1 + 1, opt_anchors);
20152015
let expected_value_to_self = stat01.value_to_self_msat - (recv_value_1 + total_fee_msat) - (recv_value_21 + total_fee_msat) - (recv_value_22 + total_fee_msat) - (recv_value_3 + total_fee_msat);
2016-
let stat0 = get_channel_value_stat!(nodes[0], chan_1.2);
2016+
let stat0 = get_channel_value_stat!(nodes[0], nodes[1], chan_1.2);
20172017
assert_eq!(stat0.value_to_self_msat, expected_value_to_self);
20182018
assert_eq!(stat0.value_to_self_msat, stat0.channel_reserve_msat + commit_tx_fee_1_htlc);
20192019

2020-
let stat2 = get_channel_value_stat!(nodes[2], chan_2.2);
2020+
let stat2 = get_channel_value_stat!(nodes[2], nodes[1], chan_2.2);
20212021
assert_eq!(stat2.value_to_self_msat, stat22.value_to_self_msat + recv_value_1 + recv_value_21 + recv_value_22 + recv_value_3);
20222022
}
20232023

@@ -2051,7 +2051,7 @@ fn channel_reserve_in_flight_removes() {
20512051
let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
20522052
let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
20532053

2054-
let b_chan_values = get_channel_value_stat!(nodes[1], chan_1.2);
2054+
let b_chan_values = get_channel_value_stat!(nodes[1], nodes[0], chan_1.2);
20552055
// Route the first two HTLCs.
20562056
let payment_value_1 = b_chan_values.channel_reserve_msat - b_chan_values.value_to_self_msat - 10000;
20572057
let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], payment_value_1);
@@ -6203,18 +6203,18 @@ fn test_fail_holding_cell_htlc_upon_free() {
62036203

62046204
nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), update_msg.unwrap());
62056205

6206-
let mut chan_stat = get_channel_value_stat!(nodes[0], chan.2);
6206+
let mut chan_stat = get_channel_value_stat!(nodes[0], nodes[1], chan.2);
62076207
let channel_reserve = chan_stat.channel_reserve_msat;
6208-
let feerate = get_feerate!(nodes[0], chan.2);
6209-
let opt_anchors = get_opt_anchors!(nodes[0], chan.2);
6208+
let feerate = get_feerate!(nodes[0], nodes[1], chan.2);
6209+
let opt_anchors = get_opt_anchors!(nodes[0], nodes[1], chan.2);
62106210

62116211
// 2* and +1 HTLCs on the commit tx fee calculation for the fee spike reserve.
62126212
let max_can_send = 5000000 - channel_reserve - 2*commit_tx_fee_msat(feerate, 1 + 1, opt_anchors);
62136213
let (route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], max_can_send);
62146214

62156215
// Send a payment which passes reserve checks but gets stuck in the holding cell.
62166216
let our_payment_id = nodes[0].node.send_payment(&route, our_payment_hash, &Some(our_payment_secret)).unwrap();
6217-
chan_stat = get_channel_value_stat!(nodes[0], chan.2);
6217+
chan_stat = get_channel_value_stat!(nodes[0], nodes[1], chan.2);
62186218
assert_eq!(chan_stat.holding_cell_outbound_amount_msat, max_can_send);
62196219

62206220
// Flush the pending fee update.
@@ -6227,7 +6227,7 @@ fn test_fail_holding_cell_htlc_upon_free() {
62276227
// Upon receipt of the RAA, there will be an attempt to resend the holding cell
62286228
// HTLC, but now that the fee has been raised the payment will now fail, causing
62296229
// us to surface its failure to the user.
6230-
chan_stat = get_channel_value_stat!(nodes[0], chan.2);
6230+
chan_stat = get_channel_value_stat!(nodes[0], nodes[1], chan.2);
62316231
assert_eq!(chan_stat.holding_cell_outbound_amount_msat, 0);
62326232
nodes[0].logger.assert_log("lightning::ln::channel".to_string(), format!("Freeing holding cell with 1 HTLC updates in channel {}", hex::encode(chan.2)), 1);
62336233
let failure_log = format!("Failed to send HTLC with payment_hash {} due to Cannot send value that would put our balance under counterparty-announced channel reserve value ({}) in channel {}",
@@ -6283,10 +6283,10 @@ fn test_free_and_fail_holding_cell_htlcs() {
62836283

62846284
nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), update_msg.unwrap());
62856285

6286-
let mut chan_stat = get_channel_value_stat!(nodes[0], chan.2);
6286+
let mut chan_stat = get_channel_value_stat!(nodes[0], nodes[1], chan.2);
62876287
let channel_reserve = chan_stat.channel_reserve_msat;
6288-
let feerate = get_feerate!(nodes[0], chan.2);
6289-
let opt_anchors = get_opt_anchors!(nodes[0], chan.2);
6288+
let feerate = get_feerate!(nodes[0], nodes[1], chan.2);
6289+
let opt_anchors = get_opt_anchors!(nodes[0], nodes[1], chan.2);
62906290

62916291
// 2* and +1 HTLCs on the commit tx fee calculation for the fee spike reserve.
62926292
let amt_1 = 20000;
@@ -6296,10 +6296,10 @@ fn test_free_and_fail_holding_cell_htlcs() {
62966296

62976297
// Send 2 payments which pass reserve checks but get stuck in the holding cell.
62986298
nodes[0].node.send_payment(&route_1, payment_hash_1, &Some(payment_secret_1)).unwrap();
6299-
chan_stat = get_channel_value_stat!(nodes[0], chan.2);
6299+
chan_stat = get_channel_value_stat!(nodes[0], nodes[1], chan.2);
63006300
assert_eq!(chan_stat.holding_cell_outbound_amount_msat, amt_1);
63016301
let payment_id_2 = nodes[0].node.send_payment(&route_2, payment_hash_2, &Some(payment_secret_2)).unwrap();
6302-
chan_stat = get_channel_value_stat!(nodes[0], chan.2);
6302+
chan_stat = get_channel_value_stat!(nodes[0], nodes[1], chan.2);
63036303
assert_eq!(chan_stat.holding_cell_outbound_amount_msat, amt_1 + amt_2);
63046304

63056305
// Flush the pending fee update.
@@ -6313,7 +6313,7 @@ fn test_free_and_fail_holding_cell_htlcs() {
63136313
// Upon receipt of the RAA, there will be an attempt to resend the holding cell HTLCs,
63146314
// but now that the fee has been raised the second payment will now fail, causing us
63156315
// to surface its failure to the user. The first payment should succeed.
6316-
chan_stat = get_channel_value_stat!(nodes[0], chan.2);
6316+
chan_stat = get_channel_value_stat!(nodes[0], nodes[1], chan.2);
63176317
assert_eq!(chan_stat.holding_cell_outbound_amount_msat, 0);
63186318
nodes[0].logger.assert_log("lightning::ln::channel".to_string(), format!("Freeing holding cell with 2 HTLC updates in channel {}", hex::encode(chan.2)), 1);
63196319
let failure_log = format!("Failed to send HTLC with payment_hash {} due to Cannot send value that would put our balance under counterparty-announced channel reserve value ({}) in channel {}",
@@ -6411,10 +6411,10 @@ fn test_fail_holding_cell_htlc_upon_free_multihop() {
64116411

64126412
nodes[2].node.handle_update_fee(&nodes[1].node.get_our_node_id(), update_msg.unwrap());
64136413

6414-
let mut chan_stat = get_channel_value_stat!(nodes[0], chan_0_1.2);
6414+
let mut chan_stat = get_channel_value_stat!(nodes[0], nodes[1], chan_0_1.2);
64156415
let channel_reserve = chan_stat.channel_reserve_msat;
6416-
let feerate = get_feerate!(nodes[0], chan_0_1.2);
6417-
let opt_anchors = get_opt_anchors!(nodes[0], chan_0_1.2);
6416+
let feerate = get_feerate!(nodes[0], nodes[1], chan_0_1.2);
6417+
let opt_anchors = get_opt_anchors!(nodes[0], nodes[1], chan_0_1.2);
64186418

64196419
// Send a payment which passes reserve checks but gets stuck in the holding cell.
64206420
let feemsat = 239;
@@ -6435,7 +6435,7 @@ fn test_fail_holding_cell_htlc_upon_free_multihop() {
64356435
commitment_signed_dance!(nodes[1], nodes[0], payment_event.commitment_msg, false);
64366436
expect_pending_htlcs_forwardable!(nodes[1]);
64376437

6438-
chan_stat = get_channel_value_stat!(nodes[1], chan_1_2.2);
6438+
chan_stat = get_channel_value_stat!(nodes[1], nodes[2], chan_1_2.2);
64396439
assert_eq!(chan_stat.holding_cell_outbound_amount_msat, max_can_send);
64406440

64416441
// Flush the pending fee update.
@@ -6639,7 +6639,7 @@ fn test_update_add_htlc_bolt2_sender_exceed_max_htlc_value_in_flight() {
66396639
let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
66406640
let channel_value = 100000;
66416641
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, channel_value, 0, InitFeatures::known(), InitFeatures::known());
6642-
let max_in_flight = get_channel_value_stat!(nodes[0], chan.2).counterparty_max_htlc_value_in_flight_msat;
6642+
let max_in_flight = get_channel_value_stat!(nodes[0], nodes[1], chan.2).counterparty_max_htlc_value_in_flight_msat;
66436643

66446644
send_payment(&nodes[0], &vec!(&nodes[1])[..], max_in_flight);
66456645

@@ -6694,10 +6694,10 @@ fn test_update_add_htlc_bolt2_receiver_sender_can_afford_amount_sent() {
66946694
let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
66956695
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 100000, 95000000, InitFeatures::known(), InitFeatures::known());
66966696

6697-
let chan_stat = get_channel_value_stat!(nodes[0], chan.2);
6697+
let chan_stat = get_channel_value_stat!(nodes[0], nodes[1], chan.2);
66986698
let channel_reserve = chan_stat.channel_reserve_msat;
6699-
let feerate = get_feerate!(nodes[0], chan.2);
6700-
let opt_anchors = get_opt_anchors!(nodes[0], chan.2);
6699+
let feerate = get_feerate!(nodes[0], nodes[1], chan.2);
6700+
let opt_anchors = get_opt_anchors!(nodes[0], nodes[1], chan.2);
67016701
// The 2* and +1 are for the fee spike reserve.
67026702
let commit_tx_fee_outbound = 2 * commit_tx_fee_msat(feerate, 1 + 1, opt_anchors);
67036703

@@ -6773,7 +6773,7 @@ fn test_update_add_htlc_bolt2_receiver_check_max_in_flight_msat() {
67736773
nodes[0].node.send_payment(&route, our_payment_hash, &Some(our_payment_secret)).unwrap();
67746774
check_added_monitors!(nodes[0], 1);
67756775
let mut updates = get_htlc_update_msgs!(nodes[0], nodes[1].node.get_our_node_id());
6776-
updates.update_add_htlcs[0].amount_msat = get_channel_value_stat!(nodes[1], chan.2).counterparty_max_htlc_value_in_flight_msat + 1;
6776+
updates.update_add_htlcs[0].amount_msat = get_channel_value_stat!(nodes[1], nodes[0], chan.2).counterparty_max_htlc_value_in_flight_msat + 1;
67776777
nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &updates.update_add_htlcs[0]);
67786778

67796779
assert!(nodes[1].node.list_channels().is_empty());

‎lightning/src/ln/monitor_tests.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ fn chanmon_claim_value_coop_close() {
159159
let funding_outpoint = OutPoint { txid: funding_tx.txid(), index: 0 };
160160
assert_eq!(funding_outpoint.to_channel_id(), chan_id);
161161

162-
let chan_feerate = get_feerate!(nodes[0], chan_id) as u64;
163-
let opt_anchors = get_opt_anchors!(nodes[0], chan_id);
162+
let chan_feerate = get_feerate!(nodes[0], nodes[1], chan_id) as u64;
163+
let opt_anchors = get_opt_anchors!(nodes[0], nodes[1], chan_id);
164164

165165
assert_eq!(vec![Balance::ClaimableOnChannelClose {
166166
claimable_amount_satoshis: 1_000_000 - 1_000 - chan_feerate * channel::commitment_tx_base_weight(opt_anchors) / 1000
@@ -259,8 +259,8 @@ fn do_test_claim_value_force_close(prev_commitment_tx: bool) {
259259

260260
let htlc_cltv_timeout = nodes[0].best_block_info().1 + TEST_FINAL_CLTV + 1; // Note ChannelManager adds one to CLTV timeouts for safety
261261

262-
let chan_feerate = get_feerate!(nodes[0], chan_id) as u64;
263-
let opt_anchors = get_opt_anchors!(nodes[0], chan_id);
262+
let chan_feerate = get_feerate!(nodes[0], nodes[1], chan_id) as u64;
263+
let opt_anchors = get_opt_anchors!(nodes[0], nodes[1], chan_id);
264264

265265
let remote_txn = get_local_commitment_txn!(nodes[1], chan_id);
266266
// Before B receives the payment preimage, it only suggests the push_msat value of 1_000 sats
@@ -606,8 +606,8 @@ fn test_balances_on_local_commitment_htlcs() {
606606
check_added_monitors!(nodes[1], 1);
607607
expect_payment_claimed!(nodes[1], payment_hash_2, 20_000_000);
608608

609-
let chan_feerate = get_feerate!(nodes[0], chan_id) as u64;
610-
let opt_anchors = get_opt_anchors!(nodes[0], chan_id);
609+
let chan_feerate = get_feerate!(nodes[0], nodes[1], chan_id) as u64;
610+
let opt_anchors = get_opt_anchors!(nodes[0], nodes[1], chan_id);
611611

612612
// Get nodes[0]'s commitment transaction and HTLC-Timeout transactions
613613
let as_txn = get_local_commitment_txn!(nodes[0], chan_id);

0 commit comments

Comments
 (0)