Skip to content

Commit c9575b0

Browse files
naumenkogsnaumenkogs
committed
Move our_id out of NetworkGraph
1 parent f2c1ee6 commit c9575b0

File tree

7 files changed

+106
-109
lines changed

7 files changed

+106
-109
lines changed

‎fuzz/src/full_stack.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
335335
config.channel_options.announced_channel = get_slice!(1)[0] != 0;
336336
config.peer_channel_config_limits.min_dust_limit_satoshis = 0;
337337
let channelmanager = Arc::new(ChannelManager::new(Network::Bitcoin, fee_est.clone(), monitor.clone(), broadcast.clone(), Arc::clone(&logger), keys_manager.clone(), config, 0).unwrap());
338-
let network_graph = Arc::new(NetworkGraph::new(PublicKey::from_secret_key(&Secp256k1::signing_only(), &keys_manager.get_node_secret()), watch.clone(), Arc::clone(&logger)));
338+
let our_id = PublicKey::from_secret_key(&Secp256k1::signing_only(), &keys_manager.get_node_secret());
339+
let network_graph = Arc::new(NetworkGraph::new(our_id, watch.clone(), Arc::clone(&logger)));
339340

340341
let peers = RefCell::new([false; 256]);
341342
let mut loss_detector = MoneyLossDetector::new(&peers, channelmanager.clone(), monitor.clone(), PeerManager::new(MessageHandler {
@@ -392,7 +393,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
392393
},
393394
4 => {
394395
let value = slice_to_be24(get_slice!(3)) as u64;
395-
let route = match get_route(&network_graph, &get_pubkey!(), None, &Vec::new(), value, 42, Arc::clone(&logger)) {
396+
let route = match get_route(&our_id, &network_graph, &get_pubkey!(), None, &Vec::new(), value, 42, Arc::clone(&logger)) {
396397
Ok(route) => route,
397398
Err(_) => return,
398399
};
@@ -409,7 +410,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
409410
},
410411
15 => {
411412
let value = slice_to_be24(get_slice!(3)) as u64;
412-
let mut route = match get_route(&network_graph, &get_pubkey!(), None, &Vec::new(), value, 42, Arc::clone(&logger)) {
413+
let mut route = match get_route(&our_id, &network_graph, &get_pubkey!(), None, &Vec::new(), value, 42, Arc::clone(&logger)) {
413414
Ok(route) => route,
414415
Err(_) => return,
415416
};

‎fuzz/src/router.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
228228
}
229229
&last_hops_vec[..]
230230
};
231-
let _ = get_route(&network_graph, &target, first_hops, last_hops, slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger));
231+
let _ = get_route(&our_pubkey, &network_graph, &target, first_hops, last_hops, slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger));
232232
},
233233
_ => return,
234234
}

‎lightning/src/ln/chanmon_update_fail_tests.rs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fn test_simple_monitor_permanent_update_fail() {
3535

3636
*nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::PermanentFailure);
3737
let network_graph = &nodes[0].network_graph;
38-
let route = get_route(network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
38+
let route = get_route(&nodes[0].node.get_our_node_id(), network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
3939
unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), true, APIError::ChannelUnavailable {..}, {});
4040
check_added_monitors!(nodes[0], 2);
4141

@@ -72,7 +72,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
7272

7373
{
7474
let network_graph = &nodes[0].network_graph;
75-
let route = get_route(network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
75+
let route = get_route(&nodes[0].node.get_our_node_id(), network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
7676
unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &None), false, APIError::MonitorUpdateFailed, {});
7777
check_added_monitors!(nodes[0], 1);
7878
}
@@ -119,7 +119,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
119119
{
120120
*nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
121121
let network_graph = &nodes[0].network_graph;
122-
let route = get_route(network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
122+
let route = get_route(&nodes[0].node.get_our_node_id(), network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
123123
unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
124124
check_added_monitors!(nodes[0], 1);
125125
}
@@ -185,7 +185,7 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
185185
{
186186
*nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
187187
let network_graph = &nodes[0].network_graph;
188-
let route = get_route(network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
188+
let route = get_route(&nodes[0].node.get_our_node_id(), network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
189189
unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &None), false, APIError::MonitorUpdateFailed, {});
190190
check_added_monitors!(nodes[0], 1);
191191
}
@@ -516,7 +516,7 @@ fn test_monitor_update_fail_cs() {
516516
let (payment_preimage, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
517517
{
518518
let network_graph = &nodes[0].network_graph;
519-
let route = get_route(network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
519+
let route = get_route(&nodes[0].node.get_our_node_id(), network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
520520
nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
521521
check_added_monitors!(nodes[0], 1);
522522
}
@@ -605,7 +605,7 @@ fn test_monitor_update_fail_no_rebroadcast() {
605605
let (payment_preimage_1, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
606606
{
607607
let network_graph = &nodes[0].network_graph;
608-
let route = get_route(network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
608+
let route = get_route(&nodes[0].node.get_our_node_id(), network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
609609
nodes[0].node.send_payment(&route, our_payment_hash, &None).unwrap();
610610
check_added_monitors!(nodes[0], 1);
611611
}
@@ -656,7 +656,7 @@ fn test_monitor_update_raa_while_paused() {
656656
let (payment_preimage_1, our_payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
657657
{
658658
let network_graph = &nodes[0].network_graph;
659-
let route = get_route(network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
659+
let route = get_route(&nodes[0].node.get_our_node_id(), network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
660660
nodes[0].node.send_payment(&route, our_payment_hash_1, &None).unwrap();
661661
check_added_monitors!(nodes[0], 1);
662662
}
@@ -665,7 +665,7 @@ fn test_monitor_update_raa_while_paused() {
665665
let (payment_preimage_2, our_payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
666666
{
667667
let network_graph = &nodes[1].network_graph;
668-
let route = get_route(network_graph, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
668+
let route = get_route(&nodes[1].node.get_our_node_id(), network_graph, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
669669
nodes[1].node.send_payment(&route, our_payment_hash_2, &None).unwrap();
670670
check_added_monitors!(nodes[1], 1);
671671
}
@@ -757,7 +757,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
757757
let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
758758
{
759759
let network_graph = &nodes[0].network_graph;
760-
let route = get_route(network_graph, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
760+
let route = get_route(&nodes[0].node.get_our_node_id(), network_graph, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
761761
nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
762762
check_added_monitors!(nodes[0], 1);
763763
}
@@ -784,7 +784,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
784784
let (_, payment_hash_3) = get_payment_preimage_hash!(nodes[0]);
785785
{
786786
let network_graph = &nodes[0].network_graph;
787-
let route = get_route(network_graph, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
787+
let route = get_route(&nodes[0].node.get_our_node_id(), network_graph, &nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
788788
nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
789789
check_added_monitors!(nodes[0], 1);
790790
}
@@ -833,7 +833,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
833833
// Try to route another payment backwards from 2 to make sure 1 holds off on responding
834834
let (payment_preimage_4, payment_hash_4) = get_payment_preimage_hash!(nodes[0]);
835835
let network_graph = &nodes[2].network_graph;
836-
let route = get_route(network_graph, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
836+
let route = get_route(&nodes[2].node.get_our_node_id(), network_graph, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
837837
nodes[2].node.send_payment(&route, payment_hash_4, &None).unwrap();
838838
check_added_monitors!(nodes[2], 1);
839839

@@ -1087,7 +1087,7 @@ fn raa_no_response_awaiting_raa_state() {
10871087
// generation during RAA while in monitor-update-failed state.
10881088
{
10891089
let network_graph = &nodes[0].network_graph;
1090-
let route = get_route(network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
1090+
let route = get_route(&nodes[0].node.get_our_node_id(), network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
10911091
nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
10921092
check_added_monitors!(nodes[0], 1);
10931093
nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
@@ -1141,7 +1141,7 @@ fn raa_no_response_awaiting_raa_state() {
11411141
// commitment transaction states) whereas here we can explicitly check for it.
11421142
{
11431143
let network_graph = &nodes[0].network_graph;
1144-
let route = get_route(network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
1144+
let route = get_route(&nodes[0].node.get_our_node_id(), network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
11451145
nodes[0].node.send_payment(&route, payment_hash_3, &None).unwrap();
11461146
check_added_monitors!(nodes[0], 0);
11471147
assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
@@ -1233,7 +1233,7 @@ fn claim_while_disconnected_monitor_update_fail() {
12331233
let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
12341234
{
12351235
let network_graph = &nodes[0].network_graph;
1236-
let route = get_route(network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
1236+
let route = get_route(&nodes[0].node.get_our_node_id(), network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
12371237
nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
12381238
check_added_monitors!(nodes[0], 1);
12391239
}
@@ -1329,7 +1329,7 @@ fn monitor_failed_no_reestablish_response() {
13291329
let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
13301330
{
13311331
let network_graph = &nodes[0].network_graph;
1332-
let route = get_route(network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
1332+
let route = get_route(&nodes[0].node.get_our_node_id(), network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
13331333
nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
13341334
check_added_monitors!(nodes[0], 1);
13351335
}
@@ -1403,7 +1403,7 @@ fn first_message_on_recv_ordering() {
14031403
let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
14041404
{
14051405
let network_graph = &nodes[0].network_graph;
1406-
let route = get_route(network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
1406+
let route = get_route(&nodes[0].node.get_our_node_id(), network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
14071407
nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
14081408
check_added_monitors!(nodes[0], 1);
14091409
}
@@ -1428,7 +1428,7 @@ fn first_message_on_recv_ordering() {
14281428
let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
14291429
{
14301430
let network_graph = &nodes[0].network_graph;
1431-
let route = get_route(network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
1431+
let route = get_route(&nodes[0].node.get_our_node_id(), network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
14321432
nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
14331433
check_added_monitors!(nodes[0], 1);
14341434
}
@@ -1508,7 +1508,7 @@ fn test_monitor_update_fail_claim() {
15081508
let (_, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
15091509
{
15101510
let network_graph = &nodes[2].network_graph;
1511-
let route = get_route(network_graph, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
1511+
let route = get_route(&nodes[2].node.get_our_node_id(), network_graph, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
15121512
nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
15131513
check_added_monitors!(nodes[2], 1);
15141514
}
@@ -1593,7 +1593,7 @@ fn test_monitor_update_on_pending_forwards() {
15931593
let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
15941594
{
15951595
let network_graph = &nodes[2].network_graph;
1596-
let route = get_route(network_graph, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
1596+
let route = get_route(&nodes[2].node.get_our_node_id(), network_graph, &nodes[0].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
15971597
nodes[2].node.send_payment(&route, payment_hash_2, &None).unwrap();
15981598
check_added_monitors!(nodes[2], 1);
15991599
}
@@ -1656,7 +1656,7 @@ fn monitor_update_claim_fail_no_response() {
16561656
let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
16571657
{
16581658
let network_graph = &nodes[0].network_graph;
1659-
let route = get_route(network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
1659+
let route = get_route(&nodes[0].node.get_our_node_id(), network_graph, &nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, logger.clone()).unwrap();
16601660
nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
16611661
check_added_monitors!(nodes[0], 1);
16621662
}
@@ -1821,7 +1821,7 @@ fn test_path_paused_mpp() {
18211821

18221822
let (payment_preimage, payment_hash) = get_payment_preimage_hash!(&nodes[0]);
18231823
let payment_secret = PaymentSecret([0xdb; 32]);
1824-
let mut route = get_route(&nodes[0].network_graph, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, logger.clone()).unwrap();
1824+
let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].network_graph, &nodes[3].node.get_our_node_id(), None, &[], 100000, TEST_FINAL_CLTV, logger.clone()).unwrap();
18251825

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

‎lightning/src/ln/functional_test_utils.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ pub struct Node<'a, 'b: 'a, 'c: 'b> {
8484
pub keys_manager: &'b test_utils::TestKeysInterface,
8585
pub node: &'a ChannelManager<EnforcingChannelKeys, &'b TestChannelMonitor<'c>, &'c test_utils::TestBroadcaster, &'b test_utils::TestKeysInterface, &'c test_utils::TestFeeEstimator>,
8686
pub network_graph: NetworkGraph,
87+
pub our_node_id: PublicKey,
8788
pub node_seed: [u8; 32],
8889
pub network_payment_count: Rc<RefCell<u8>>,
8990
pub network_chan_count: Rc<RefCell<u32>>,
@@ -952,7 +953,7 @@ pub const TEST_FINAL_CLTV: u32 = 32;
952953
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash) {
953954
let network_graph = &origin_node.network_graph;
954955
let logger = Arc::new(test_utils::TestLogger::new());
955-
let route = get_route(network_graph, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, logger.clone()).unwrap();
956+
let route = get_route(&origin_node.our_node_id, network_graph, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, logger.clone()).unwrap();
956957
assert_eq!(route.paths.len(), 1);
957958
assert_eq!(route.paths[0].len(), expected_route.len());
958959
for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
@@ -965,7 +966,7 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
965966
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
966967
let logger = Arc::new(test_utils::TestLogger::new());
967968
let network_graph = &origin_node.network_graph;
968-
let route = get_route(network_graph, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, logger.clone()).unwrap();
969+
let route = get_route(&origin_node.our_node_id, network_graph, &expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV, logger.clone()).unwrap();
969970
assert_eq!(route.paths.len(), 1);
970971
assert_eq!(route.paths[0].len(), expected_route.len());
971972
for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
@@ -1113,6 +1114,7 @@ pub fn create_network<'a, 'b: 'a, 'c: 'b>(node_count: usize, cfgs: &'b Vec<NodeC
11131114
keys_manager: &cfgs[i].keys_manager, node: &chan_mgrs[i], network_graph,
11141115
node_seed: cfgs[i].node_seed, network_chan_count: chan_count.clone(),
11151116
network_payment_count: payment_count.clone(), logger: cfgs[i].logger.clone(),
1117+
our_node_id: PublicKey::from_secret_key(&secp_ctx, &cfgs[i].keys_manager.get_node_secret()),
11161118
})
11171119
}
11181120

0 commit comments

Comments
 (0)