Skip to content

Commit 9e57364

Browse files
TheBlueMattTheBlueMatt
committed
Add an Option<>al InvoiceFeatures object for the payee in get_route
We currently only use it to override the graph-specific features returned in the route, though we should also use it to enable or disable MPP. Note that tests which relied on MPP behavior have had all of their get_route calls upgraded to provide the MPP flag.
1 parent 5b230d9 commit 9e57364

File tree

7 files changed

+174
-143
lines changed

7 files changed

+174
-143
lines changed

‎fuzz/src/full_stack.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
414414
},
415415
4 => {
416416
let value = slice_to_be24(get_slice!(3)) as u64;
417-
let route = match get_route(&our_id, &net_graph_msg_handler.network_graph.read().unwrap(), &get_pubkey!(), None, &Vec::new(), value, 42, Arc::clone(&logger)) {
417+
let route = match get_route(&our_id, &net_graph_msg_handler.network_graph.read().unwrap(), &get_pubkey!(), None, None, &Vec::new(), value, 42, Arc::clone(&logger)) {
418418
Ok(route) => route,
419419
Err(_) => return,
420420
};
@@ -431,7 +431,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
431431
},
432432
15 => {
433433
let value = slice_to_be24(get_slice!(3)) as u64;
434-
let mut route = match get_route(&our_id, &net_graph_msg_handler.network_graph.read().unwrap(), &get_pubkey!(), None, &Vec::new(), value, 42, Arc::clone(&logger)) {
434+
let mut route = match get_route(&our_id, &net_graph_msg_handler.network_graph.read().unwrap(), &get_pubkey!(), None, None, &Vec::new(), value, 42, Arc::clone(&logger)) {
435435
Ok(route) => route,
436436
Err(_) => return,
437437
};

‎fuzz/src/router.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
238238
}
239239
let last_hops = &last_hops_vec[..];
240240
for target in node_pks.iter() {
241-
let _ = get_route(&our_pubkey, &net_graph, target,
241+
let _ = get_route(&our_pubkey, &net_graph, target, None,
242242
first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
243243
&last_hops.iter().collect::<Vec<_>>(),
244244
slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger));

‎lightning/src/ln/chanmon_update_fail_tests.rs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fn do_test_simple_monitor_permanent_update_fail(persister_fail: bool) {
5353
false => *nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::PermanentFailure))
5454
}
5555
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
56-
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
56+
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
5757
unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), true, APIError::ChannelUnavailable {..}, {});
5858
check_added_monitors!(nodes[0], 2);
5959

@@ -170,7 +170,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool, persister_fail
170170

171171
{
172172
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
173-
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
173+
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
174174
unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), false, APIError::MonitorUpdateFailed, {});
175175
check_added_monitors!(nodes[0], 1);
176176
}
@@ -223,7 +223,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool, persister_fail
223223
false => *nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure))
224224
}
225225
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
226-
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
226+
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
227227
unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
228228
check_added_monitors!(nodes[0], 1);
229229
}
@@ -293,7 +293,7 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
293293
{
294294
*nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
295295
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
296-
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
296+
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
297297
unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
298298
check_added_monitors!(nodes[0], 1);
299299
}
@@ -624,7 +624,7 @@ fn test_monitor_update_fail_cs() {
624624
let (payment_preimage, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
625625
{
626626
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
627-
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
627+
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
628628
nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
629629
check_added_monitors!(nodes[0], 1);
630630
}
@@ -713,7 +713,7 @@ fn test_monitor_update_fail_no_rebroadcast() {
713713
let (payment_preimage_1, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
714714
{
715715
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
716-
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
716+
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
717717
nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
718718
check_added_monitors!(nodes[0], 1);
719719
}
@@ -764,7 +764,7 @@ fn test_monitor_update_raa_while_paused() {
764764
let (payment_preimage_1, our_payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
765765
{
766766
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
767-
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
767+
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
768768
nodes[0].node.send_payment(&route, our_payment_hash_1, &None).unwrap();
769769
check_added_monitors!(nodes[0], 1);
770770
}
@@ -773,7 +773,7 @@ fn test_monitor_update_raa_while_paused() {
773773
let (payment_preimage_2, our_payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
774774
{
775775
let net_graph_msg_handler = &nodes[1].net_graph_msg_handler;
776-
let route = get_route(&nodes[1].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
776+
let route = get_route(&nodes[1].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[0].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
777777
nodes[1].node.send_payment(&route, our_payment_hash_2, &None).unwrap();
778778
check_added_monitors!(nodes[1], 1);
779779
}
@@ -865,7 +865,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
865865
let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
866866
{
867867
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
868-
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
868+
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[2].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
869869
nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
870870
check_added_monitors!(nodes[0], 1);
871871
}
@@ -892,7 +892,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
892892
let (_, payment_hash_3) = get_payment_preimage_hash!(nodes[0]);
893893
{
894894
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
895-
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
895+
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[2].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
896896
nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
897897
check_added_monitors!(nodes[0], 1);
898898
}
@@ -941,7 +941,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
941941
// Try to route another payment backwards from 2 to make sure 1 holds off on responding
942942
let (payment_preimage_4, payment_hash_4) = get_payment_preimage_hash!(nodes[0]);
943943
let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
944-
let route = get_route(&nodes[2].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
944+
let route = get_route(&nodes[2].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[0].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
945945
nodes[2].node.send_payment(&route, payment_hash_4, &None).unwrap();
946946
check_added_monitors!(nodes[2], 1);
947947

@@ -1195,7 +1195,7 @@ fn raa_no_response_awaiting_raa_state() {
11951195
// generation during RAA while in monitor-update-failed state.
11961196
{
11971197
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
1198-
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1198+
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
11991199
nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
12001200
check_added_monitors!(nodes[0], 1);
12011201
nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
@@ -1249,7 +1249,7 @@ fn raa_no_response_awaiting_raa_state() {
12491249
// commitment transaction states) whereas here we can explicitly check for it.
12501250
{
12511251
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
1252-
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1252+
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
12531253
nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
12541254
check_added_monitors!(nodes[0], 0);
12551255
assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
@@ -1341,7 +1341,7 @@ fn claim_while_disconnected_monitor_update_fail() {
13411341
let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
13421342
{
13431343
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
1344-
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1344+
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
13451345
nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
13461346
check_added_monitors!(nodes[0], 1);
13471347
}
@@ -1437,7 +1437,7 @@ fn monitor_failed_no_reestablish_response() {
14371437
let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
14381438
{
14391439
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
1440-
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1440+
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
14411441
nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
14421442
check_added_monitors!(nodes[0], 1);
14431443
}
@@ -1511,7 +1511,7 @@ fn first_message_on_recv_ordering() {
15111511
let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
15121512
{
15131513
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
1514-
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1514+
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
15151515
nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
15161516
check_added_monitors!(nodes[0], 1);
15171517
}
@@ -1536,7 +1536,7 @@ fn first_message_on_recv_ordering() {
15361536
let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
15371537
{
15381538
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
1539-
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1539+
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
15401540
nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
15411541
check_added_monitors!(nodes[0], 1);
15421542
}
@@ -1616,7 +1616,7 @@ fn test_monitor_update_fail_claim() {
16161616
let (_, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
16171617
{
16181618
let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
1619-
let route = get_route(&nodes[2].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1619+
let route = get_route(&nodes[2].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[0].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
16201620
nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
16211621
check_added_monitors!(nodes[2], 1);
16221622
}
@@ -1701,7 +1701,7 @@ fn test_monitor_update_on_pending_forwards() {
17011701
let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
17021702
{
17031703
let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
1704-
let route = get_route(&nodes[2].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1704+
let route = get_route(&nodes[2].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[0].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
17051705
nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
17061706
check_added_monitors!(nodes[2], 1);
17071707
}
@@ -1764,7 +1764,7 @@ fn monitor_update_claim_fail_no_response() {
17641764
let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
17651765
{
17661766
let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
1767-
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1767+
let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
17681768
nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
17691769
check_added_monitors!(nodes[0], 1);
17701770
}
@@ -1929,7 +1929,7 @@ fn test_path_paused_mpp() {
19291929

19301930
let (payment_preimage, payment_hash) = get_payment_preimage_hash!(&nodes[0]);
19311931
let payment_secret = PaymentSecret([0xdb; 32]);
1932-
let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler.network_graph.read().unwrap(), &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, &logger).unwrap();
1932+
let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler.network_graph.read().unwrap(), &nodes[3].node.get_our_node_id(), None, None, &[], 100000, TEST_FINAL_CLTV, &logger).unwrap();
19331933

19341934
// Set us up to take multiple routes, one 0 -> 1 -> 3 and one 0 -> 2 -> 3:
19351935
let path = route.paths[0].clone();

‎lightning/src/ln/functional_test_utils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@ pub const TEST_FINAL_CLTV: u32 = 32;
10251025
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash) {
10261026
let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
10271027
let logger = test_utils::TestLogger::new();
1028-
let route = get_route(&origin_node.node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
1028+
let route = get_route(&origin_node.node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &expected_route.last().unwrap().node.get_our_node_id(), None, None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
10291029
assert_eq!(route.paths.len(), 1);
10301030
assert_eq!(route.paths[0].len(), expected_route.len());
10311031
for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
@@ -1038,7 +1038,7 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
10381038
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
10391039
let logger = test_utils::TestLogger::new();
10401040
let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
1041-
let route = get_route(&origin_node.node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
1041+
let route = get_route(&origin_node.node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &expected_route.last().unwrap().node.get_our_node_id(), None, None, &Vec::new(), recv_value, TEST_FINAL_CLTV, &logger).unwrap();
10421042
assert_eq!(route.paths.len(), 1);
10431043
assert_eq!(route.paths[0].len(), expected_route.len());
10441044
for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {

0 commit comments

Comments
 (0)