Skip to content

Commit c4d7b9d

Browse files
jkczyzjkczyz
committed
Make NetGraphMsgHandler::network_graph private
Since NetworkGraph has shared ownership, NetGraphMsgHandler does not need to expose its field.
1 parent bcdd852 commit c4d7b9d

File tree

8 files changed

+117
-118
lines changed

8 files changed

+117
-118
lines changed

‎fuzz/src/full_stack.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
381381
let channelmanager = Arc::new(ChannelManager::new(fee_est.clone(), monitor.clone(), broadcast.clone(), Arc::clone(&logger), keys_manager.clone(), config, params));
382382
let our_id = PublicKey::from_secret_key(&Secp256k1::signing_only(), &keys_manager.get_node_secret());
383383
let network_graph = Arc::new(NetworkGraph::new(genesis_block(network).block_hash()));
384-
let net_graph_msg_handler = Arc::new(NetGraphMsgHandler::new(network_graph, None, Arc::clone(&logger)));
384+
let net_graph_msg_handler = Arc::new(NetGraphMsgHandler::new(Arc::clone(&network_graph), None, Arc::clone(&logger)));
385385
let scorer = Scorer::with_fixed_penalty(0);
386386

387387
let peers = RefCell::new([false; 256]);
@@ -444,7 +444,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
444444
final_value_msat,
445445
final_cltv_expiry_delta: 42,
446446
};
447-
let route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
447+
let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
448448
Ok(route) => route,
449449
Err(_) => return,
450450
};
@@ -467,7 +467,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
467467
final_value_msat,
468468
final_cltv_expiry_delta: 42,
469469
};
470-
let mut route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
470+
let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
471471
Ok(route) => route,
472472
Err(_) => return,
473473
};

‎lightning-invoice/src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ mod test {
181181
final_cltv_expiry_delta: invoice.min_final_cltv_expiry() as u32,
182182
};
183183
let first_hops = nodes[0].node.list_usable_channels();
184-
let network_graph = &nodes[0].net_graph_msg_handler.network_graph;
184+
let network_graph = node_cfgs[0].network_graph;
185185
let logger = test_utils::TestLogger::new();
186186
let scorer = Scorer::with_fixed_penalty(0);
187187
let route = find_route(

‎lightning/src/ln/channelmanager.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6312,8 +6312,8 @@ mod tests {
63126312
final_cltv_expiry_delta: TEST_FINAL_CLTV,
63136313
};
63146314
let route = find_route(
6315-
&nodes[0].node.get_our_node_id(), &params,
6316-
&nodes[0].net_graph_msg_handler.network_graph, None, nodes[0].logger, &scorer
6315+
&nodes[0].node.get_our_node_id(), &params, nodes[0].network_graph, None,
6316+
nodes[0].logger, &scorer
63176317
).unwrap();
63186318
nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
63196319
check_added_monitors!(nodes[0], 1);
@@ -6343,8 +6343,8 @@ mod tests {
63436343
// To start (2), send a keysend payment but don't claim it.
63446344
let payment_preimage = PaymentPreimage([42; 32]);
63456345
let route = find_route(
6346-
&nodes[0].node.get_our_node_id(), &params,
6347-
&nodes[0].net_graph_msg_handler.network_graph, None, nodes[0].logger, &scorer
6346+
&nodes[0].node.get_our_node_id(), &params, nodes[0].network_graph, None,
6347+
nodes[0].logger, &scorer
63486348
).unwrap();
63496349
let (payment_hash, _) = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
63506350
check_added_monitors!(nodes[0], 1);
@@ -6402,7 +6402,7 @@ mod tests {
64026402
final_value_msat: 10000,
64036403
final_cltv_expiry_delta: 40,
64046404
};
6405-
let network_graph = &nodes[0].net_graph_msg_handler.network_graph;
6405+
let network_graph = nodes[0].network_graph;
64066406
let first_hops = nodes[0].node.list_usable_channels();
64076407
let scorer = Scorer::with_fixed_penalty(0);
64086408
let route = find_route(
@@ -6445,7 +6445,7 @@ mod tests {
64456445
final_value_msat: 10000,
64466446
final_cltv_expiry_delta: 40,
64476447
};
6448-
let network_graph = &nodes[0].net_graph_msg_handler.network_graph;
6448+
let network_graph = nodes[0].network_graph;
64496449
let first_hops = nodes[0].node.list_usable_channels();
64506450
let scorer = Scorer::with_fixed_penalty(0);
64516451
let route = find_route(

‎lightning/src/ln/functional_test_utils.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,9 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
243243
// Check that if we serialize the Router, we can deserialize it again.
244244
{
245245
let mut w = test_utils::TestVecWriter(Vec::new());
246-
let network_graph_ser = &self.net_graph_msg_handler.network_graph;
247-
network_graph_ser.write(&mut w).unwrap();
246+
self.network_graph.write(&mut w).unwrap();
248247
let network_graph_deser = <NetworkGraph>::read(&mut io::Cursor::new(&w.0)).unwrap();
249-
assert!(network_graph_deser == *self.net_graph_msg_handler.network_graph);
248+
assert!(network_graph_deser == *self.network_graph);
250249
let net_graph_msg_handler = NetGraphMsgHandler::new(
251250
&network_graph_deser, Some(self.chain_source), self.logger
252251
);
@@ -1017,10 +1016,9 @@ macro_rules! get_route_and_payment_hash {
10171016
let payee = $crate::routing::router::Payee::new($recv_node.node.get_our_node_id())
10181017
.with_features($crate::ln::features::InvoiceFeatures::known())
10191018
.with_route_hints($last_hops);
1020-
let net_graph_msg_handler = &$send_node.net_graph_msg_handler;
10211019
let scorer = ::routing::scorer::Scorer::with_fixed_penalty(0);
10221020
let route = ::routing::router::get_route(
1023-
&$send_node.node.get_our_node_id(), &payee, &net_graph_msg_handler.network_graph,
1021+
&$send_node.node.get_our_node_id(), &payee, $send_node.network_graph,
10241022
Some(&$send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
10251023
$recv_value, $cltv, $send_node.logger, &scorer
10261024
).unwrap();
@@ -1355,10 +1353,9 @@ pub const TEST_FINAL_CLTV: u32 = 70;
13551353
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) {
13561354
let payee = Payee::new(expected_route.last().unwrap().node.get_our_node_id())
13571355
.with_features(InvoiceFeatures::known());
1358-
let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
13591356
let scorer = Scorer::with_fixed_penalty(0);
13601357
let route = get_route(
1361-
&origin_node.node.get_our_node_id(), &payee, &net_graph_msg_handler.network_graph,
1358+
&origin_node.node.get_our_node_id(), &payee, &origin_node.network_graph,
13621359
Some(&origin_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
13631360
recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
13641361
assert_eq!(route.paths.len(), 1);
@@ -1374,9 +1371,8 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
13741371
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
13751372
let payee = Payee::new(expected_route.last().unwrap().node.get_our_node_id())
13761373
.with_features(InvoiceFeatures::known());
1377-
let net_graph_msg_handler = &origin_node.net_graph_msg_handler;
13781374
let scorer = Scorer::with_fixed_penalty(0);
1379-
let route = get_route(&origin_node.node.get_our_node_id(), &payee, &net_graph_msg_handler.network_graph, None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
1375+
let route = get_route(&origin_node.node.get_our_node_id(), &payee, origin_node.network_graph, None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
13801376
assert_eq!(route.paths.len(), 1);
13811377
assert_eq!(route.paths[0].len(), expected_route.len());
13821378
for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {

‎lightning/src/ln/functional_tests.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7163,7 +7163,7 @@ fn test_check_htlc_underpaying() {
71637163

71647164
let scorer = Scorer::with_fixed_penalty(0);
71657165
let payee = Payee::new(nodes[1].node.get_our_node_id()).with_features(InvoiceFeatures::known());
7166-
let route = get_route(&nodes[0].node.get_our_node_id(), &payee, &nodes[0].net_graph_msg_handler.network_graph, None, 10_000, TEST_FINAL_CLTV, nodes[0].logger, &scorer).unwrap();
7166+
let route = get_route(&nodes[0].node.get_our_node_id(), &payee, nodes[0].network_graph, None, 10_000, TEST_FINAL_CLTV, nodes[0].logger, &scorer).unwrap();
71677167
let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
71687168
let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, 0).unwrap();
71697169
nodes[0].node.send_payment(&route, our_payment_hash, &Some(our_payment_secret)).unwrap();
@@ -7562,12 +7562,12 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
75627562
// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
75637563
let payee = Payee::new(nodes[1].node.get_our_node_id()).with_features(InvoiceFeatures::known());
75647564
let scorer = Scorer::with_fixed_penalty(0);
7565-
let route = get_route(&nodes[0].node.get_our_node_id(), &payee, &nodes[0].net_graph_msg_handler.network_graph,
7566-
None, 3_000_000, 50, nodes[0].logger, &scorer).unwrap();
7565+
let route = get_route(&nodes[0].node.get_our_node_id(), &payee, &nodes[0].network_graph, None,
7566+
3_000_000, 50, nodes[0].logger, &scorer).unwrap();
75677567
let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
75687568
let payee = Payee::new(nodes[0].node.get_our_node_id()).with_features(InvoiceFeatures::known());
7569-
let route = get_route(&nodes[1].node.get_our_node_id(), &payee, &nodes[1].net_graph_msg_handler.network_graph,
7570-
None, 3_000_000, 50, nodes[0].logger, &scorer).unwrap();
7569+
let route = get_route(&nodes[1].node.get_our_node_id(), &payee, nodes[1].network_graph, None,
7570+
3_000_000, 50, nodes[0].logger, &scorer).unwrap();
75717571
send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);
75727572

75737573
let revoked_local_txn = get_local_commitment_txn!(nodes[1], chan.2);
@@ -9053,7 +9053,7 @@ fn test_keysend_payments_to_public_node() {
90539053
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
90549054

90559055
let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 100000, 10001, InitFeatures::known(), InitFeatures::known());
9056-
let network_graph = &nodes[0].net_graph_msg_handler.network_graph;
9056+
let network_graph = nodes[0].network_graph;
90579057
let payer_pubkey = nodes[0].node.get_our_node_id();
90589058
let payee_pubkey = nodes[1].node.get_our_node_id();
90599059
let params = RouteParameters {
@@ -9062,7 +9062,7 @@ fn test_keysend_payments_to_public_node() {
90629062
final_cltv_expiry_delta: 40,
90639063
};
90649064
let scorer = Scorer::with_fixed_penalty(0);
9065-
let route = find_route(&payer_pubkey, &params, &network_graph, None, nodes[0].logger, &scorer).unwrap();
9065+
let route = find_route(&payer_pubkey, &params, network_graph, None, nodes[0].logger, &scorer).unwrap();
90669066

90679067
let test_preimage = PaymentPreimage([42; 32]);
90689068
let (payment_hash, _) = nodes[0].node.send_spontaneous_payment(&route, Some(test_preimage)).unwrap();
@@ -9093,11 +9093,11 @@ fn test_keysend_payments_to_private_node() {
90939093
final_value_msat: 10000,
90949094
final_cltv_expiry_delta: 40,
90959095
};
9096-
let network_graph = &nodes[0].net_graph_msg_handler.network_graph;
9096+
let network_graph = nodes[0].network_graph;
90979097
let first_hops = nodes[0].node.list_usable_channels();
90989098
let scorer = Scorer::with_fixed_penalty(0);
90999099
let route = find_route(
9100-
&payer_pubkey, &params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
9100+
&payer_pubkey, &params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
91019101
nodes[0].logger, &scorer
91029102
).unwrap();
91039103

‎lightning/src/ln/shutdown_tests.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,10 @@ fn updates_shutdown_wait() {
9797

9898
let (_, payment_hash, payment_secret) = get_payment_preimage_hash!(nodes[0]);
9999

100-
let net_graph_msg_handler0 = &nodes[0].net_graph_msg_handler;
101-
let net_graph_msg_handler1 = &nodes[1].net_graph_msg_handler;
102100
let payee_1 = Payee::new(nodes[1].node.get_our_node_id()).with_features(InvoiceFeatures::known());
103-
let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payee_1, &net_graph_msg_handler0.network_graph, None, 100000, TEST_FINAL_CLTV, &logger, &scorer).unwrap();
101+
let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payee_1, nodes[0].network_graph, None, 100000, TEST_FINAL_CLTV, &logger, &scorer).unwrap();
104102
let payee_2 = Payee::new(nodes[0].node.get_our_node_id()).with_features(InvoiceFeatures::known());
105-
let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payee_2, &net_graph_msg_handler1.network_graph, None, 100000, TEST_FINAL_CLTV, &logger, &scorer).unwrap();
103+
let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payee_2, nodes[1].network_graph, None, 100000, TEST_FINAL_CLTV, &logger, &scorer).unwrap();
106104
unwrap_send_err!(nodes[0].node.send_payment(&route_1, payment_hash, &Some(payment_secret)), true, APIError::ChannelUnavailable {..}, {});
107105
unwrap_send_err!(nodes[1].node.send_payment(&route_2, payment_hash, &Some(payment_secret)), true, APIError::ChannelUnavailable {..}, {});
108106

‎lightning/src/routing/network_graph.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ pub struct NetGraphMsgHandler<G: Deref<Target=NetworkGraph>, C: Deref, L: Deref>
209209
where C::Target: chain::Access, L::Target: Logger
210210
{
211211
secp_ctx: Secp256k1<secp256k1::VerifyOnly>,
212-
/// Representation of the payment channel network
213-
pub network_graph: G,
212+
network_graph: G,
214213
chain_access: Option<C>,
215214
full_syncs_requested: AtomicUsize,
216215
pending_events: Mutex<Vec<MessageSendEvent>>,

0 commit comments

Comments
 (0)