Skip to content

Commit 41e94f9

Browse files
wpaulinowpaulino
authored
Merge pull request #2239 from valentinewallace/2023-04-remove-redundant-final-cltv-param
Remove redundant `final_cltv_delta` param from `get_route`
2 parents 88c63e9 + cae41c1 commit 41e94f9

7 files changed

+127
-133
lines changed

‎lightning/src/ln/functional_test_utils.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -1697,14 +1697,14 @@ macro_rules! get_payment_preimage_hash {
16971697
}
16981698

16991699
/// Gets a route from the given sender to the node described in `payment_params`.
1700-
pub fn get_route(send_node: &Node, payment_params: &PaymentParameters, recv_value: u64, final_cltv_expiry_delta: u32) -> Result<Route, msgs::LightningError> {
1700+
pub fn get_route(send_node: &Node, payment_params: &PaymentParameters, recv_value: u64) -> Result<Route, msgs::LightningError> {
17011701
let scorer = TestScorer::new();
17021702
let keys_manager = TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
17031703
let random_seed_bytes = keys_manager.get_secure_random_bytes();
17041704
router::get_route(
17051705
&send_node.node.get_our_node_id(), payment_params, &send_node.network_graph.read_only(),
17061706
Some(&send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
1707-
recv_value, final_cltv_expiry_delta, send_node.logger, &scorer, &random_seed_bytes
1707+
recv_value, send_node.logger, &scorer, &random_seed_bytes
17081708
)
17091709
}
17101710

@@ -1713,8 +1713,8 @@ pub fn get_route(send_node: &Node, payment_params: &PaymentParameters, recv_valu
17131713
/// Don't use this, use the identically-named function instead.
17141714
#[macro_export]
17151715
macro_rules! get_route {
1716-
($send_node: expr, $payment_params: expr, $recv_value: expr, $cltv: expr) => {
1717-
$crate::ln::functional_test_utils::get_route(&$send_node, &$payment_params, $recv_value, $cltv)
1716+
($send_node: expr, $payment_params: expr, $recv_value: expr) => {
1717+
$crate::ln::functional_test_utils::get_route(&$send_node, &$payment_params, $recv_value)
17181718
}
17191719
}
17201720

@@ -1724,12 +1724,12 @@ macro_rules! get_route_and_payment_hash {
17241724
($send_node: expr, $recv_node: expr, $recv_value: expr) => {{
17251725
let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id(), TEST_FINAL_CLTV)
17261726
.with_features($recv_node.node.invoice_features());
1727-
$crate::get_route_and_payment_hash!($send_node, $recv_node, payment_params, $recv_value, TEST_FINAL_CLTV)
1727+
$crate::get_route_and_payment_hash!($send_node, $recv_node, payment_params, $recv_value)
17281728
}};
1729-
($send_node: expr, $recv_node: expr, $payment_params: expr, $recv_value: expr, $cltv: expr) => {{
1729+
($send_node: expr, $recv_node: expr, $payment_params: expr, $recv_value: expr) => {{
17301730
let (payment_preimage, payment_hash, payment_secret) =
17311731
$crate::ln::functional_test_utils::get_payment_preimage_hash(&$recv_node, Some($recv_value), None);
1732-
let route = $crate::ln::functional_test_utils::get_route(&$send_node, &$payment_params, $recv_value, $cltv);
1732+
let route = $crate::ln::functional_test_utils::get_route(&$send_node, &$payment_params, $recv_value);
17331733
(route.unwrap(), payment_hash, payment_preimage, payment_secret)
17341734
}}
17351735
}
@@ -2273,7 +2273,7 @@ pub const TEST_FINAL_CLTV: u32 = 70;
22732273
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
22742274
let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
22752275
.with_features(expected_route.last().unwrap().node.invoice_features());
2276-
let route = get_route(origin_node, &payment_params, recv_value, TEST_FINAL_CLTV).unwrap();
2276+
let route = get_route(origin_node, &payment_params, recv_value).unwrap();
22772277
assert_eq!(route.paths.len(), 1);
22782278
assert_eq!(route.paths[0].hops.len(), expected_route.len());
22792279
for (node, hop) in expected_route.iter().zip(route.paths[0].hops.iter()) {
@@ -2294,7 +2294,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
22942294
let random_seed_bytes = keys_manager.get_secure_random_bytes();
22952295
let route = router::get_route(
22962296
&origin_node.node.get_our_node_id(), &payment_params, &network_graph,
2297-
None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
2297+
None, recv_value, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
22982298
assert_eq!(route.paths.len(), 1);
22992299
assert_eq!(route.paths[0].hops.len(), expected_route.len());
23002300
for (node, hop) in expected_route.iter().zip(route.paths[0].hops.iter()) {

‎lightning/src/ln/functional_tests.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -1830,7 +1830,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
18301830
{
18311831
let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
18321832
.with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
1833-
let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, recv_value_0, TEST_FINAL_CLTV);
1833+
let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, recv_value_0);
18341834
route.paths[0].hops.last_mut().unwrap().fee_msat += 1;
18351835
assert!(route.paths[0].hops.iter().rev().skip(1).all(|h| h.fee_msat == feemsat));
18361836

@@ -1857,7 +1857,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
18571857

18581858
let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
18591859
.with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
1860-
let route = get_route!(nodes[0], payment_params, recv_value_0, TEST_FINAL_CLTV).unwrap();
1860+
let route = get_route!(nodes[0], payment_params, recv_value_0).unwrap();
18611861
let (payment_preimage, ..) = send_along_route(&nodes[0], route, &[&nodes[1], &nodes[2]], recv_value_0);
18621862
claim_payment(&nodes[0], &[&nodes[1], &nodes[2]], payment_preimage);
18631863

@@ -4796,7 +4796,7 @@ fn test_duplicate_payment_hash_one_failure_one_success() {
47964796
// ACCEPTED_HTLC_SCRIPT_WEIGHT.
47974797
let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV - 40)
47984798
.with_features(nodes[3].node.invoice_features());
4799-
let (route, _, _, _) = get_route_and_payment_hash!(nodes[0], nodes[3], payment_params, 800_000, TEST_FINAL_CLTV - 40);
4799+
let (route, _, _, _) = get_route_and_payment_hash!(nodes[0], nodes[3], payment_params, 800_000);
48004800
send_along_route_with_secret(&nodes[0], route, &[&[&nodes[1], &nodes[2], &nodes[3]]], 800_000, duplicate_payment_hash, payment_secret);
48014801

48024802
let commitment_txn = get_local_commitment_txn!(nodes[2], chan_2.2);
@@ -6102,7 +6102,7 @@ fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() {
61026102

61036103
let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 0)
61046104
.with_features(nodes[1].node.invoice_features());
6105-
let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], payment_params, 100000000, 0);
6105+
let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], payment_params, 100000000);
61066106
route.paths[0].hops.last_mut().unwrap().cltv_expiry_delta = 500000001;
61076107
unwrap_send_err!(nodes[0].node.send_payment_with_route(&route, our_payment_hash,
61086108
RecipientOnionFields::secret_only(our_payment_secret), PaymentId(our_payment_hash.0)
@@ -7044,7 +7044,7 @@ fn test_check_htlc_underpaying() {
70447044
let scorer = test_utils::TestScorer::new();
70457045
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
70467046
let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
7047-
let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, TEST_FINAL_CLTV, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
7047+
let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
70487048
let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
70497049
let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
70507050
nodes[0].node.send_payment_with_route(&route, our_payment_hash,
@@ -7190,7 +7190,7 @@ fn test_bump_penalty_txn_on_revoked_commitment() {
71907190
let payment_preimage = route_payment(&nodes[0], &vec!(&nodes[1])[..], 3000000).0;
71917191
let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 30)
71927192
.with_features(nodes[0].node.invoice_features());
7193-
let (route,_, _, _) = get_route_and_payment_hash!(nodes[1], nodes[0], payment_params, 3000000, 30);
7193+
let (route,_, _, _) = get_route_and_payment_hash!(nodes[1], nodes[0], payment_params, 3000000);
71947194
send_along_route(&nodes[1], route, &vec!(&nodes[0])[..], 3000000);
71957195

71967196
let revoked_txn = get_local_commitment_txn!(nodes[0], chan.2);
@@ -7298,11 +7298,11 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
72987298
let scorer = test_utils::TestScorer::new();
72997299
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
73007300
let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
7301-
3_000_000, 50, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
7301+
3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
73027302
let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
73037303
let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_features(nodes[0].node.invoice_features());
73047304
let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
7305-
3_000_000, 50, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
7305+
3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
73067306
send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);
73077307

73087308
let revoked_local_txn = get_local_commitment_txn!(nodes[1], chan.2);
@@ -9301,7 +9301,7 @@ fn do_test_dup_htlc_second_rejected(test_for_second_fail_panic: bool) {
93019301

93029302
let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV)
93039303
.with_features(nodes[1].node.invoice_features());
9304-
let route = get_route!(nodes[0], payment_params, 10_000, TEST_FINAL_CLTV).unwrap();
9304+
let route = get_route!(nodes[0], payment_params, 10_000).unwrap();
93059305

93069306
let (our_payment_preimage, our_payment_hash, our_payment_secret) = get_payment_preimage_hash!(&nodes[1]);
93079307

@@ -9410,7 +9410,7 @@ fn test_inconsistent_mpp_params() {
94109410

94119411
let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV)
94129412
.with_features(nodes[3].node.invoice_features());
9413-
let mut route = get_route!(nodes[0], payment_params, 15_000_000, TEST_FINAL_CLTV).unwrap();
9413+
let mut route = get_route!(nodes[0], payment_params, 15_000_000).unwrap();
94149414
assert_eq!(route.paths.len(), 2);
94159415
route.paths.sort_by(|path_a, _| {
94169416
// Sort the path so that the path through nodes[1] comes first
@@ -9956,7 +9956,7 @@ fn do_payment_with_custom_min_final_cltv_expiry(valid_delta: bool, use_user_hash
99569956
let (payment_hash, payment_secret) = nodes[1].node.create_inbound_payment(Some(recv_value), 7200, Some(min_final_cltv_expiry_delta)).unwrap();
99579957
(payment_hash, nodes[1].node.get_payment_preimage(payment_hash, payment_secret).unwrap(), payment_secret)
99589958
};
9959-
let route = get_route!(nodes[0], payment_parameters, recv_value, final_cltv_expiry_delta as u32).unwrap();
9959+
let route = get_route!(nodes[0], payment_parameters, recv_value).unwrap();
99609960
nodes[0].node.send_payment_with_route(&route, payment_hash,
99619961
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)).unwrap();
99629962
check_added_monitors!(nodes[0], 1);

‎lightning/src/ln/onion_route_tests.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ fn do_test_onion_failure_stale_channel_update(announced_channel: bool) {
716716
let payment_params = PaymentParameters::from_node_id(*channel_to_update_counterparty, TEST_FINAL_CLTV)
717717
.with_features(nodes[2].node.invoice_features())
718718
.with_route_hints(hop_hints);
719-
get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, PAYMENT_AMT, TEST_FINAL_CLTV)
719+
get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, PAYMENT_AMT)
720720
};
721721
send_along_route_with_secret(&nodes[0], route.clone(), &[&[&nodes[1], &nodes[2]]], PAYMENT_AMT,
722722
payment_hash, payment_secret);
@@ -862,7 +862,7 @@ fn test_always_create_tlv_format_onion_payloads() {
862862

863863
let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
864864
.with_features(InvoiceFeatures::empty());
865-
let (route, _payment_hash, _payment_preimage, _payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 40000, TEST_FINAL_CLTV);
865+
let (route, _payment_hash, _payment_preimage, _payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 40000);
866866

867867
let hops = &route.paths[0].hops;
868868
// Asserts that the first hop to `node[1]` signals no support for variable length onions.
@@ -993,7 +993,7 @@ macro_rules! get_phantom_route {
993993
(get_route(
994994
&$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
995995
Some(&$nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
996-
$amt, TEST_FINAL_CLTV, $nodes[0].logger, &scorer, &[0u8; 32]
996+
$amt, $nodes[0].logger, &scorer, &[0u8; 32]
997997
).unwrap(), phantom_route_hint.phantom_scid)
998998
}
999999
}}

‎lightning/src/ln/payment_tests.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ fn get_ldk_payment_preimage() {
864864
let route = get_route(
865865
&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(),
866866
Some(&nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
867-
amt_msat, TEST_FINAL_CLTV, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
867+
amt_msat, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
868868
nodes[0].node.send_payment_with_route(&route, payment_hash,
869869
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)).unwrap();
870870
check_added_monitors!(nodes[0], 1);
@@ -974,7 +974,7 @@ fn failed_probe_yields_event() {
974974

975975
let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), 42);
976976

977-
let (route, _, _, _) = get_route_and_payment_hash!(&nodes[0], nodes[2], &payment_params, 9_998_000, 42);
977+
let (route, _, _, _) = get_route_and_payment_hash!(&nodes[0], nodes[2], &payment_params, 9_998_000);
978978

979979
let (payment_hash, payment_id) = nodes[0].node.send_probe(route.paths[0].clone()).unwrap();
980980

@@ -1023,7 +1023,7 @@ fn onchain_failed_probe_yields_event() {
10231023
let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), 42);
10241024

10251025
// Send a dust HTLC, which will be treated as if it timed out once the channel hits the chain.
1026-
let (route, _, _, _) = get_route_and_payment_hash!(&nodes[0], nodes[2], &payment_params, 1_000, 42);
1026+
let (route, _, _, _) = get_route_and_payment_hash!(&nodes[0], nodes[2], &payment_params, 1_000);
10271027
let (payment_hash, payment_id) = nodes[0].node.send_probe(route.paths[0].clone()).unwrap();
10281028

10291029
// node[0] -- update_add_htlcs -> node[1]
@@ -1418,8 +1418,7 @@ fn do_test_intercepted_payment(test: InterceptTest) {
14181418
let route = get_route(
14191419
&nodes[0].node.get_our_node_id(), &route_params.payment_params,
14201420
&nodes[0].network_graph.read_only(), None, route_params.final_value_msat,
1421-
route_params.payment_params.final_cltv_expiry_delta, nodes[0].logger, &scorer,
1422-
&random_seed_bytes,
1421+
nodes[0].logger, &scorer, &random_seed_bytes,
14231422
).unwrap();
14241423

14251424
let (payment_hash, payment_secret) = nodes[2].node.create_inbound_payment(Some(amt_msat), 60 * 60, None).unwrap();

‎lightning/src/ln/priv_short_conf_tests.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fn test_priv_forwarding_rejection() {
6969
let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
7070
.with_features(nodes[2].node.invoice_features())
7171
.with_route_hints(last_hops);
72-
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);
72+
let (route, our_payment_hash, our_payment_preimage, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 10_000);
7373

7474
nodes[0].node.send_payment_with_route(&route, our_payment_hash,
7575
RecipientOnionFields::secret_only(our_payment_secret), PaymentId(our_payment_hash.0)).unwrap();
@@ -238,7 +238,7 @@ fn test_routed_scid_alias() {
238238
let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), 42)
239239
.with_features(nodes[2].node.invoice_features())
240240
.with_route_hints(hop_hints);
241-
let (route, payment_hash, payment_preimage, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 100_000, 42);
241+
let (route, payment_hash, payment_preimage, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 100_000);
242242
assert_eq!(route.paths[0].hops[1].short_channel_id, last_hop[0].inbound_scid_alias.unwrap());
243243
nodes[0].node.send_payment_with_route(&route, payment_hash,
244244
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)).unwrap();
@@ -404,7 +404,7 @@ fn test_inbound_scid_privacy() {
404404
let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), 42)
405405
.with_features(nodes[2].node.invoice_features())
406406
.with_route_hints(hop_hints.clone());
407-
let (route, payment_hash, payment_preimage, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 100_000, 42);
407+
let (route, payment_hash, payment_preimage, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 100_000);
408408
assert_eq!(route.paths[0].hops[1].short_channel_id, last_hop[0].inbound_scid_alias.unwrap());
409409
nodes[0].node.send_payment_with_route(&route, payment_hash,
410410
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)).unwrap();
@@ -420,7 +420,7 @@ fn test_inbound_scid_privacy() {
420420
let payment_params_2 = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), 42)
421421
.with_features(nodes[2].node.invoice_features())
422422
.with_route_hints(hop_hints);
423-
let (route_2, payment_hash_2, _, payment_secret_2) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params_2, 100_000, 42);
423+
let (route_2, payment_hash_2, _, payment_secret_2) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params_2, 100_000);
424424
assert_eq!(route_2.paths[0].hops[1].short_channel_id, last_hop[0].short_channel_id.unwrap());
425425
nodes[0].node.send_payment_with_route(&route_2, payment_hash_2,
426426
RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
@@ -472,7 +472,7 @@ fn test_scid_alias_returned() {
472472
let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), 42)
473473
.with_features(nodes[2].node.invoice_features())
474474
.with_route_hints(hop_hints);
475-
let (mut route, payment_hash, _, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 10_000, 42);
475+
let (mut route, payment_hash, _, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 10_000);
476476
assert_eq!(route.paths[0].hops[1].short_channel_id, nodes[2].node.list_usable_channels()[0].inbound_scid_alias.unwrap());
477477

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

‎lightning/src/ln/shutdown_tests.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ fn updates_shutdown_wait() {
9595
let (_, payment_hash, payment_secret) = get_payment_preimage_hash!(nodes[0]);
9696

9797
let payment_params_1 = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
98-
let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, TEST_FINAL_CLTV, &logger, &scorer, &random_seed_bytes).unwrap();
98+
let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, &nodes[0].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
9999
let payment_params_2 = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[0].node.invoice_features());
100-
let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, TEST_FINAL_CLTV, &logger, &scorer, &random_seed_bytes).unwrap();
100+
let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, &nodes[1].network_graph.read_only(), None, 100000, &logger, &scorer, &random_seed_bytes).unwrap();
101101
unwrap_send_err!(nodes[0].node.send_payment_with_route(&route_1, payment_hash,
102102
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
103103
), true, APIError::ChannelUnavailable {..}, {});

0 commit comments

Comments
 (0)