Skip to content

Commit b28bcfe

Browse files
ViktorTigerstromViktorTigerstrom
committed
Pass PaymentParameters in get_route_and_payment_hash 
1 parent a316ef4 commit b28bcfe

File tree

3 files changed

+36
-16
lines changed

3 files changed

+36
-16
lines changed

‎lightning/src/ln/functional_test_utils.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,19 +1171,18 @@ macro_rules! get_payment_preimage_hash {
11711171
#[macro_export]
11721172
macro_rules! get_route_and_payment_hash {
11731173
($send_node: expr, $recv_node: expr, $recv_value: expr) => {{
1174-
$crate::get_route_and_payment_hash!($send_node, $recv_node, vec![], $recv_value, TEST_FINAL_CLTV)
1174+
let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id())
1175+
.with_features($crate::ln::features::InvoiceFeatures::known());
1176+
$crate::get_route_and_payment_hash!($send_node, $recv_node, payment_params, $recv_value, TEST_FINAL_CLTV)
11751177
}};
1176-
($send_node: expr, $recv_node: expr, $last_hops: expr, $recv_value: expr, $cltv: expr) => {{
1178+
($send_node: expr, $recv_node: expr, $payment_params: expr, $recv_value: expr, $cltv: expr) => {{
11771179
use $crate::chain::keysinterface::KeysInterface;
11781180
let (payment_preimage, payment_hash, payment_secret) = $crate::get_payment_preimage_hash!($recv_node, Some($recv_value));
1179-
let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id())
1180-
.with_features($crate::ln::features::InvoiceFeatures::known())
1181-
.with_route_hints($last_hops);
11821181
let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
11831182
let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
11841183
let random_seed_bytes = keys_manager.get_secure_random_bytes();
11851184
let route = $crate::routing::router::get_route(
1186-
&$send_node.node.get_our_node_id(), &payment_params, &$send_node.network_graph.read_only(),
1185+
&$send_node.node.get_our_node_id(), &$payment_params, &$send_node.network_graph.read_only(),
11871186
Some(&$send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
11881187
$recv_value, $cltv, $send_node.logger, &scorer, &random_seed_bytes
11891188
).unwrap();

‎lightning/src/ln/functional_tests.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5188,7 +5188,9 @@ fn test_duplicate_payment_hash_one_failure_one_success() {
51885188
// We reduce the final CLTV here by a somewhat arbitrary constant to keep it under the one-byte
51895189
// script push size limit so that the below script length checks match
51905190
// ACCEPTED_HTLC_SCRIPT_WEIGHT.
5191-
let (route, _, _, _) = get_route_and_payment_hash!(nodes[0], nodes[3], vec![], 900000, TEST_FINAL_CLTV - 40);
5191+
let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id())
5192+
.with_features(InvoiceFeatures::known());
5193+
let (route, _, _, _) = get_route_and_payment_hash!(nodes[0], nodes[3], payment_params, 900000, TEST_FINAL_CLTV - 40);
51925194
send_along_route_with_secret(&nodes[0], route, &[&[&nodes[1], &nodes[2], &nodes[3]]], 900000, duplicate_payment_hash, payment_secret);
51935195

51945196
let commitment_txn = get_local_commitment_txn!(nodes[2], chan_2.2);
@@ -6437,7 +6439,9 @@ fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() {
64376439
let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
64386440
let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0, InitFeatures::known(), InitFeatures::known());
64396441

6440-
let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], vec![], 100000000, 0);
6442+
let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id())
6443+
.with_features(InvoiceFeatures::known());
6444+
let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], payment_params, 100000000, 0);
64416445
route.paths[0].last_mut().unwrap().cltv_expiry_delta = 500000001;
64426446
unwrap_send_err!(nodes[0].node.send_payment(&route, our_payment_hash, &Some(our_payment_secret)), true, APIError::RouteError { ref err },
64436447
assert_eq!(err, &"Channel CLTV overflowed?"));
@@ -7537,7 +7541,9 @@ fn test_bump_penalty_txn_on_revoked_commitment() {
75377541
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000, InitFeatures::known(), InitFeatures::known());
75387542

75397543
let payment_preimage = route_payment(&nodes[0], &vec!(&nodes[1])[..], 3000000).0;
7540-
let (route,_, _, _) = get_route_and_payment_hash!(nodes[1], nodes[0], vec![], 3000000, 30);
7544+
let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id())
7545+
.with_features(InvoiceFeatures::known());
7546+
let (route,_, _, _) = get_route_and_payment_hash!(nodes[1], nodes[0], payment_params, 3000000, 30);
75417547
send_along_route(&nodes[1], route, &vec!(&nodes[0])[..], 3000000);
75427548

75437549
let revoked_txn = get_local_commitment_txn!(nodes[0], chan.2);

‎lightning/src/ln/priv_short_conf_tests.rs

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ use chain::channelmonitor::ChannelMonitor;
1616
use chain::keysinterface::{Recipient, KeysInterface};
1717
use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, MIN_CLTV_EXPIRY_DELTA};
1818
use routing::network_graph::RoutingFees;
19-
use routing::router::{RouteHint, RouteHintHop};
20-
use ln::features::InitFeatures;
19+
use routing::router::{PaymentParameters, RouteHint, RouteHintHop};
20+
use ln::features::{InitFeatures, InvoiceFeatures};
2121
use ln::msgs;
2222
use ln::msgs::{ChannelMessageHandler, RoutingMessageHandler, OptionalField};
2323
use util::enforcing_trait_impls::EnforcingSigner;
@@ -71,7 +71,10 @@ fn test_priv_forwarding_rejection() {
7171
htlc_maximum_msat: None,
7272
}]);
7373
let last_hops = vec![route_hint];
74-
let (route, our_payment_hash, our_payment_preimage, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], last_hops, 10_000, TEST_FINAL_CLTV);
74+
let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id())
75+
.with_features(InvoiceFeatures::known())
76+
.with_route_hints(last_hops);
77+
let (route, our_payment_hash, our_payment_preimage, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 10_000, TEST_FINAL_CLTV);
7578

7679
nodes[0].node.send_payment(&route, our_payment_hash, &Some(our_payment_secret)).unwrap();
7780
check_added_monitors!(nodes[0], 1);
@@ -269,7 +272,10 @@ fn test_routed_scid_alias() {
269272
htlc_maximum_msat: None,
270273
htlc_minimum_msat: None,
271274
}])];
272-
let (route, payment_hash, payment_preimage, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], hop_hints, 100_000, 42);
275+
let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id())
276+
.with_features(InvoiceFeatures::known())
277+
.with_route_hints(hop_hints);
278+
let (route, payment_hash, payment_preimage, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 100_000, 42);
273279
assert_eq!(route.paths[0][1].short_channel_id, last_hop[0].inbound_scid_alias.unwrap());
274280
nodes[0].node.send_payment(&route, payment_hash, &Some(payment_secret)).unwrap();
275281
check_added_monitors!(nodes[0], 1);
@@ -419,7 +425,10 @@ fn test_inbound_scid_privacy() {
419425
htlc_maximum_msat: None,
420426
htlc_minimum_msat: None,
421427
}])];
422-
let (route, payment_hash, payment_preimage, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], hop_hints.clone(), 100_000, 42);
428+
let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id())
429+
.with_features(InvoiceFeatures::known())
430+
.with_route_hints(hop_hints.clone());
431+
let (route, payment_hash, payment_preimage, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 100_000, 42);
423432
assert_eq!(route.paths[0][1].short_channel_id, last_hop[0].inbound_scid_alias.unwrap());
424433
nodes[0].node.send_payment(&route, payment_hash, &Some(payment_secret)).unwrap();
425434
check_added_monitors!(nodes[0], 1);
@@ -431,7 +440,10 @@ fn test_inbound_scid_privacy() {
431440
// what channel we're talking about.
432441
hop_hints[0].0[0].short_channel_id = last_hop[0].short_channel_id.unwrap();
433442

434-
let (route_2, payment_hash_2, _, payment_secret_2) = get_route_and_payment_hash!(nodes[0], nodes[2], hop_hints, 100_000, 42);
443+
let payment_params_2 = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id())
444+
.with_features(InvoiceFeatures::known())
445+
.with_route_hints(hop_hints);
446+
let (route_2, payment_hash_2, _, payment_secret_2) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params_2, 100_000, 42);
435447
assert_eq!(route_2.paths[0][1].short_channel_id, last_hop[0].short_channel_id.unwrap());
436448
nodes[0].node.send_payment(&route_2, payment_hash_2, &Some(payment_secret_2)).unwrap();
437449
check_added_monitors!(nodes[0], 1);
@@ -479,7 +491,10 @@ fn test_scid_alias_returned() {
479491
htlc_maximum_msat: None,
480492
htlc_minimum_msat: None,
481493
}])];
482-
let (mut route, payment_hash, _, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], hop_hints, 10_000, 42);
494+
let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id())
495+
.with_features(InvoiceFeatures::known())
496+
.with_route_hints(hop_hints);
497+
let (mut route, payment_hash, _, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 10_000, 42);
483498
assert_eq!(route.paths[0][1].short_channel_id, nodes[2].node.list_usable_channels()[0].inbound_scid_alias.unwrap());
484499

485500
route.paths[0][1].fee_msat = 10_000_000; // Overshoot the last channel's value

0 commit comments

Comments
 (0)