Skip to content

Commit 1a9ff7e

Browse files
jkczyzjkczyz
committed
Move network_graph.rs to network.rs
The routing::network_graph module contains a few structs related to the network, including NetworkGraph. So using a shorter name for the module seems more appropriate.
1 parent 7caf607 commit 1a9ff7e

23 files changed

+34
-32
lines changed

‎fuzz/src/full_stack.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use lightning::ln::channelmanager::{ChainParameters, ChannelManager};
3737
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,IgnoringMessageHandler};
3838
use lightning::ln::msgs::DecodeError;
3939
use lightning::ln::script::ShutdownScript;
40-
use lightning::routing::network_graph::{NetworkGossip, NetworkGraph};
40+
use lightning::routing::network::{NetworkGossip, NetworkGraph};
4141
use lightning::routing::router::{find_route, Payee, RouteParameters};
4242
use lightning::routing::scorer::Scorer;
4343
use lightning::util::config::UserConfig;

‎fuzz/src/router.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use lightning::routing::router::{find_route, Payee, RouteHint, RouteHintHop, Rou
2020
use lightning::routing::scorer::Scorer;
2121
use lightning::util::logger::Logger;
2222
use lightning::util::ser::Readable;
23-
use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
23+
use lightning::routing::network::{NetworkGraph, RoutingFees};
2424

2525
use bitcoin::hashes::Hash;
2626
use bitcoin::secp256k1::key::PublicKey;

‎lightning-background-processor/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use lightning::chain::keysinterface::{Sign, KeysInterface};
1515
use lightning::ln::channelmanager::ChannelManager;
1616
use lightning::ln::msgs::{ChannelMessageHandler, RoutingMessageHandler};
1717
use lightning::ln::peer_handler::{CustomMessageHandler, PeerManager, SocketDescriptor};
18-
use lightning::routing::network_graph::{NetworkGraph, NetworkGossip};
18+
use lightning::routing::network::{NetworkGraph, NetworkGossip};
1919
use lightning::util::events::{Event, EventHandler, EventsProvider};
2020
use lightning::util::logger::Logger;
2121
use std::sync::Arc;
@@ -161,7 +161,7 @@ impl BackgroundProcessor {
161161
/// [`ChannelManager`]: lightning::ln::channelmanager::ChannelManager
162162
/// [`ChannelManager::write`]: lightning::ln::channelmanager::ChannelManager#impl-Writeable
163163
/// [`FilesystemPersister::persist_manager`]: lightning_persister::FilesystemPersister::persist_manager
164-
/// [`NetworkGraph`]: lightning::routing::network_graph::NetworkGraph
164+
/// [`NetworkGraph`]: lightning::routing::network::NetworkGraph
165165
pub fn start<
166166
Signer: 'static + Sign,
167167
CA: 'static + Deref + Send + Sync,
@@ -312,7 +312,7 @@ mod tests {
312312
use lightning::ln::features::InitFeatures;
313313
use lightning::ln::msgs::{ChannelMessageHandler, Init};
314314
use lightning::ln::peer_handler::{PeerManager, MessageHandler, SocketDescriptor, IgnoringMessageHandler};
315-
use lightning::routing::network_graph::{NetworkGraph, NetworkGossip};
315+
use lightning::routing::network::{NetworkGraph, NetworkGossip};
316316
use lightning::util::config::UserConfig;
317317
use lightning::util::events::{Event, MessageSendEventsProvider, MessageSendEvent};
318318
use lightning::util::ser::Writeable;

‎lightning-invoice/src/de.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use bech32::{u5, FromBase32};
1111
use bitcoin_hashes::Hash;
1212
use bitcoin_hashes::sha256;
1313
use lightning::ln::PaymentSecret;
14-
use lightning::routing::network_graph::RoutingFees;
14+
use lightning::routing::network::RoutingFees;
1515
use lightning::routing::router::{RouteHint, RouteHintHop};
1616

1717
use num_traits::{CheckedAdd, CheckedMul};
@@ -950,7 +950,7 @@ mod test {
950950

951951
#[test]
952952
fn test_parse_route() {
953-
use lightning::routing::network_graph::RoutingFees;
953+
use lightning::routing::network::RoutingFees;
954954
use lightning::routing::router::{RouteHint, RouteHintHop};
955955
use ::PrivateRoute;
956956
use bech32::FromBase32;

‎lightning-invoice/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use bitcoin_hashes::sha256;
3030
use lightning::ln::PaymentSecret;
3131
use lightning::ln::features::InvoiceFeatures;
3232
#[cfg(any(doc, test))]
33-
use lightning::routing::network_graph::RoutingFees;
33+
use lightning::routing::network::RoutingFees;
3434
use lightning::routing::router::RouteHint;
3535

3636
use secp256k1::key::PublicKey;

‎lightning-invoice/src/payment.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
//! # use lightning::ln::channelmanager::{ChannelDetails, PaymentId, PaymentSendFailure};
3232
//! # use lightning::ln::msgs::LightningError;
3333
//! # use lightning::routing;
34-
//! # use lightning::routing::network_graph::NodeId;
34+
//! # use lightning::routing::network::NodeId;
3535
//! # use lightning::routing::router::{Route, RouteHop, RouteParameters};
3636
//! # use lightning::util::events::{Event, EventHandler, EventsProvider};
3737
//! # use lightning::util::logger::{Logger, Record};
@@ -458,7 +458,7 @@ mod tests {
458458
use lightning::ln::features::{ChannelFeatures, NodeFeatures, InitFeatures};
459459
use lightning::ln::functional_test_utils::*;
460460
use lightning::ln::msgs::{ErrorAction, LightningError};
461-
use lightning::routing::network_graph::NodeId;
461+
use lightning::routing::network::NodeId;
462462
use lightning::routing::router::{Payee, Route, RouteHop};
463463
use lightning::util::test_utils::TestLogger;
464464
use lightning::util::errors::APIError;

‎lightning-invoice/src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use lightning::ln::{PaymentHash, PaymentSecret};
1212
use lightning::ln::channelmanager::{ChannelDetails, ChannelManager, PaymentId, PaymentSendFailure, MIN_FINAL_CLTV_EXPIRY};
1313
use lightning::ln::msgs::LightningError;
1414
use lightning::routing;
15-
use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
15+
use lightning::routing::network::{NetworkGraph, RoutingFees};
1616
use lightning::routing::router::{Route, RouteHint, RouteHintHop, RouteParameters, find_route};
1717
use lightning::util::logger::Logger;
1818
use secp256k1::key::PublicKey;

‎lightning-invoice/tests/ser_de.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use bitcoin_hashes::{sha256, Hash};
1010
use bech32::u5;
1111
use lightning::ln::PaymentSecret;
1212
use lightning::routing::router::{RouteHint, RouteHintHop};
13-
use lightning::routing::network_graph::RoutingFees;
13+
use lightning::routing::network::RoutingFees;
1414
use lightning_invoice::*;
1515
use secp256k1::PublicKey;
1616
use secp256k1::recovery::{RecoverableSignature, RecoveryId};

‎lightning/src/ln/channelmanager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6539,7 +6539,7 @@ pub mod bench {
65396539
use ln::features::{InitFeatures, InvoiceFeatures};
65406540
use ln::functional_test_utils::*;
65416541
use ln::msgs::{ChannelMessageHandler, Init};
6542-
use routing::network_graph::NetworkGraph;
6542+
use routing::network::NetworkGraph;
65436543
use routing::router::{Payee, get_route};
65446544
use routing::scorer::Scorer;
65456545
use util::test_utils;

‎lightning/src/ln/functional_test_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use chain::channelmonitor::ChannelMonitor;
1515
use chain::transaction::OutPoint;
1616
use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
1717
use ln::channelmanager::{ChainParameters, ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentSendFailure, PaymentId};
18-
use routing::network_graph::{NetworkGossip, NetworkGraph};
18+
use routing::network::{NetworkGossip, NetworkGraph};
1919
use routing::router::{Payee, Route, get_route};
2020
use ln::features::{InitFeatures, InvoiceFeatures};
2121
use ln::msgs;

‎lightning/src/ln/functional_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, PaymentId, RAAC
2323
use ln::channel::{Channel, ChannelError};
2424
use ln::{chan_utils, onion_utils};
2525
use ln::chan_utils::HTLC_SUCCESS_TX_WEIGHT;
26-
use routing::network_graph::{NetworkUpdate, RoutingFees};
26+
use routing::network::{NetworkUpdate, RoutingFees};
2727
use routing::router::{Payee, Route, RouteHop, RouteHint, RouteHintHop, RouteParameters, find_route, get_route};
2828
use ln::features::{ChannelFeatures, InitFeatures, InvoiceFeatures, NodeFeatures};
2929
use ln::msgs;

‎lightning/src/ln/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
//! High level lightning structs and impls live here.
1111
//!
12-
//! You probably want to create a channelmanager::ChannelManager, and a routing::network_graph::NetworkGossip first.
12+
//! You probably want to create a channelmanager::ChannelManager, and a routing::network::NetworkGossip first.
1313
//! Then, you probably want to pass them both on to a peer_handler::PeerManager and use that to
1414
//! create/manage connections and call get_and_clear_pending_events after each action, handling
1515
//! them appropriately.

‎lightning/src/ln/monitor_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use ln::channelmanager::BREAKDOWN_TIMEOUT;
1616
use ln::features::InitFeatures;
1717
use ln::msgs::{ChannelMessageHandler, ErrorAction};
1818
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason};
19-
use routing::network_graph::NetworkUpdate;
19+
use routing::network::NetworkUpdate;
2020

2121
use bitcoin::hashes::sha256::Hash as Sha256;
2222
use bitcoin::hashes::Hash;

‎lightning/src/ln/onion_route_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use chain::channelmonitor::{CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS};
1515
use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
1616
use ln::channelmanager::{HTLCForwardInfo, CLTV_FAR_FAR_AWAY};
1717
use ln::onion_utils;
18-
use routing::network_graph::NetworkUpdate;
18+
use routing::network::NetworkUpdate;
1919
use routing::router::Route;
2020
use ln::features::InitFeatures;
2121
use ln::msgs;

‎lightning/src/ln/onion_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use ln::{PaymentHash, PaymentPreimage, PaymentSecret};
1111
use ln::channelmanager::HTLCSource;
1212
use ln::msgs;
13-
use routing::network_graph::NetworkUpdate;
13+
use routing::network::NetworkUpdate;
1414
use routing::router::RouteHop;
1515
use util::chacha20::ChaCha20;
1616
use util::errors::{self, APIError};

‎lightning/src/ln/peer_handler.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use ln::wire;
2727
use util::atomic_counter::AtomicCounter;
2828
use util::events::{MessageSendEvent, MessageSendEventsProvider};
2929
use util::logger::Logger;
30-
use routing::network_graph::{NetworkGossip, NetworkGraph};
30+
use routing::network::{NetworkGossip, NetworkGraph};
3131

3232
use prelude::*;
3333
use io;
@@ -208,7 +208,7 @@ pub struct MessageHandler<CM: Deref, RM: Deref> where
208208
/// A message handler which handles messages updating our knowledge of the network channel
209209
/// graph. Usually this is just a [`NetworkGossip`] object or an [`IgnoringMessageHandler`].
210210
///
211-
/// [`NetworkGossip`]: crate::routing::network_graph::NetworkGossip
211+
/// [`NetworkGossip`]: crate::routing::network::NetworkGossip
212212
pub route_handler: RM,
213213
}
214214

‎lightning/src/ln/reorg_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use ln::PaymentHash;
1616
use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs};
1717
use ln::features::InitFeatures;
1818
use ln::msgs::{ChannelMessageHandler, ErrorAction};
19-
use routing::network_graph::NetworkUpdate;
19+
use routing::network::NetworkUpdate;
2020
use util::enforcing_trait_impls::EnforcingSigner;
2121
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason};
2222
use util::test_utils;

‎lightning/src/ln/shutdown_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use chain::transaction::OutPoint;
1414
use ln::{PaymentPreimage, PaymentHash};
1515
use ln::channelmanager::PaymentSendFailure;
1616
use routing::router::{Payee, get_route};
17-
use routing::network_graph::NetworkUpdate;
17+
use routing::network::NetworkUpdate;
1818
use ln::features::{InitFeatures, InvoiceFeatures};
1919
use ln::msgs;
2020
use ln::msgs::{ChannelMessageHandler, ErrorAction};

‎lightning/src/routing/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ pub mod network_graph;
1313
pub mod router;
1414
pub mod scorer;
1515

16-
use routing::network_graph::NodeId;
16+
pub use routing::network_graph as network;
17+
18+
use routing::network::NodeId;
1719
use routing::router::RouteHop;
1820

1921
use core::cell::{RefCell, RefMut};

‎lightning/src/routing/network_graph.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,7 @@ mod tests {
12271227
use chain;
12281228
use ln::PaymentHash;
12291229
use ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
1230-
use routing::network_graph::{NetworkGossip, NetworkGraph, NetworkUpdate, MAX_EXCESS_BYTES_FOR_RELAY};
1230+
use routing::network::{NetworkGossip, NetworkGraph, NetworkUpdate, MAX_EXCESS_BYTES_FOR_RELAY};
12311231
use ln::msgs::{Init, OptionalField, RoutingMessageHandler, UnsignedNodeAnnouncement, NodeAnnouncement,
12321232
UnsignedChannelAnnouncement, ChannelAnnouncement, UnsignedChannelUpdate, ChannelUpdate,
12331233
ReplyChannelRange, ReplyShortChannelIdsEnd, QueryChannelRange, QueryShortChannelIds, MAX_VALUE_MSAT};

‎lightning/src/routing/router.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use ln::channelmanager::ChannelDetails;
1818
use ln::features::{ChannelFeatures, InvoiceFeatures, NodeFeatures};
1919
use ln::msgs::{DecodeError, ErrorAction, LightningError, MAX_VALUE_MSAT};
2020
use routing;
21-
use routing::network_graph::{NetworkGraph, NodeId, RoutingFees};
21+
use routing::network::{NetworkGraph, NodeId, RoutingFees};
2222
use util::ser::{Writeable, Readable};
2323
use util::logger::{Level, Logger};
2424

@@ -1473,7 +1473,7 @@ where L::Target: Logger {
14731473
#[cfg(test)]
14741474
mod tests {
14751475
use routing;
1476-
use routing::network_graph::{NetworkGossip, NetworkGraph, NodeId};
1476+
use routing::network::{NetworkGossip, NetworkGraph, NodeId};
14771477
use routing::router::{get_route, Payee, Route, RouteHint, RouteHintHop, RouteHop, RoutingFees};
14781478
use chain::transaction::OutPoint;
14791479
use ln::features::{ChannelFeatures, InitFeatures, InvoiceFeatures, NodeFeatures};

‎lightning/src/routing/scorer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//! ```
1818
//! # extern crate secp256k1;
1919
//! #
20-
//! # use lightning::routing::network_graph::NetworkGraph;
20+
//! # use lightning::routing::network::NetworkGraph;
2121
//! # use lightning::routing::router::{RouteParameters, find_route};
2222
//! # use lightning::routing::scorer::{Scorer, ScoringParameters};
2323
//! # use lightning::util::logger::{Logger, Record};
@@ -55,7 +55,7 @@
5555
use routing;
5656

5757
use ln::msgs::DecodeError;
58-
use routing::network_graph::NodeId;
58+
use routing::network::NodeId;
5959
use routing::router::RouteHop;
6060
use util::ser::{Readable, Writeable, Writer};
6161

‎lightning/src/util/events.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use ln::channelmanager::PaymentId;
1919
use ln::msgs;
2020
use ln::msgs::DecodeError;
2121
use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
22-
use routing::network_graph::NetworkUpdate;
22+
use routing::network::NetworkUpdate;
2323
use util::ser::{BigSize, FixedLengthReader, Writeable, Writer, MaybeReadable, Readable, VecReadWrapper, VecWriteWrapper};
2424
use routing::router::{RouteHop, RouteParameters};
2525

@@ -226,8 +226,8 @@ pub enum Event {
226226
/// Should be applied to the [`NetworkGraph`] so that routing decisions can take into
227227
/// account the update. [`NetworkGossip`] is capable of doing this.
228228
///
229-
/// [`NetworkGraph`]: crate::routing::network_graph::NetworkGraph
230-
/// [`NetworkGossip`]: crate::routing::network_graph::NetworkGossip
229+
/// [`NetworkGraph`]: crate::routing::network::NetworkGraph
230+
/// [`NetworkGossip`]: crate::routing::network::NetworkGossip
231231
network_update: Option<NetworkUpdate>,
232232
/// For both single-path and multi-path payments, this is set if all paths of the payment have
233233
/// failed. This will be set to false if (1) this is an MPP payment and (2) other parts of the

0 commit comments

Comments
 (0)