Move network_graph.rs to network.rs

jkczyz · jkczyz · commit 1a9ff7e77bb0 · 2021-11-08T15:15:39.000-06:00
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.
diff --git a/fuzz/src/full_stack.rs b/fuzz/src/full_stack.rs
@@ -37,7 +37,7 @@ use lightning::ln::channelmanager::{ChainParameters, ChannelManager};
 use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,IgnoringMessageHandler};
 use lightning::ln::msgs::DecodeError;
 use lightning::ln::script::ShutdownScript;
-use lightning::routing::network_graph::{NetworkGossip, NetworkGraph};
+use lightning::routing::network::{NetworkGossip, NetworkGraph};
 use lightning::routing::router::{find_route, Payee, RouteParameters};
 use lightning::routing::scorer::Scorer;
 use lightning::util::config::UserConfig;
diff --git a/fuzz/src/router.rs b/fuzz/src/router.rs
@@ -20,7 +20,7 @@ use lightning::routing::router::{find_route, Payee, RouteHint, RouteHintHop, Rou
 use lightning::routing::scorer::Scorer;
 use lightning::util::logger::Logger;
 use lightning::util::ser::Readable;
-use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
+use lightning::routing::network::{NetworkGraph, RoutingFees};
 
 use bitcoin::hashes::Hash;
 use bitcoin::secp256k1::key::PublicKey;
diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
@@ -15,7 +15,7 @@ use lightning::chain::keysinterface::{Sign, KeysInterface};
 use lightning::ln::channelmanager::ChannelManager;
 use lightning::ln::msgs::{ChannelMessageHandler, RoutingMessageHandler};
 use lightning::ln::peer_handler::{CustomMessageHandler, PeerManager, SocketDescriptor};
-use lightning::routing::network_graph::{NetworkGraph, NetworkGossip};
+use lightning::routing::network::{NetworkGraph, NetworkGossip};
 use lightning::util::events::{Event, EventHandler, EventsProvider};
 use lightning::util::logger::Logger;
 use std::sync::Arc;
@@ -161,7 +161,7 @@ impl BackgroundProcessor {
 	/// [`ChannelManager`]: lightning::ln::channelmanager::ChannelManager
 	/// [`ChannelManager::write`]: lightning::ln::channelmanager::ChannelManager#impl-Writeable
 	/// [`FilesystemPersister::persist_manager`]: lightning_persister::FilesystemPersister::persist_manager
-	/// [`NetworkGraph`]: lightning::routing::network_graph::NetworkGraph
+	/// [`NetworkGraph`]: lightning::routing::network::NetworkGraph
 	pub fn start<
 		Signer: 'static + Sign,
 		CA: 'static + Deref + Send + Sync,
@@ -312,7 +312,7 @@ mod tests {
 	use lightning::ln::features::InitFeatures;
 	use lightning::ln::msgs::{ChannelMessageHandler, Init};
 	use lightning::ln::peer_handler::{PeerManager, MessageHandler, SocketDescriptor, IgnoringMessageHandler};
-	use lightning::routing::network_graph::{NetworkGraph, NetworkGossip};
+	use lightning::routing::network::{NetworkGraph, NetworkGossip};
 	use lightning::util::config::UserConfig;
 	use lightning::util::events::{Event, MessageSendEventsProvider, MessageSendEvent};
 	use lightning::util::ser::Writeable;
diff --git a/lightning-invoice/src/de.rs b/lightning-invoice/src/de.rs
@@ -11,7 +11,7 @@ use bech32::{u5, FromBase32};
 use bitcoin_hashes::Hash;
 use bitcoin_hashes::sha256;
 use lightning::ln::PaymentSecret;
-use lightning::routing::network_graph::RoutingFees;
+use lightning::routing::network::RoutingFees;
 use lightning::routing::router::{RouteHint, RouteHintHop};
 
 use num_traits::{CheckedAdd, CheckedMul};
@@ -950,7 +950,7 @@ mod test {
 
 	#[test]
 	fn test_parse_route() {
-		use lightning::routing::network_graph::RoutingFees;
+		use lightning::routing::network::RoutingFees;
 		use lightning::routing::router::{RouteHint, RouteHintHop};
 		use ::PrivateRoute;
 		use bech32::FromBase32;
diff --git a/lightning-invoice/src/lib.rs b/lightning-invoice/src/lib.rs
@@ -30,7 +30,7 @@ use bitcoin_hashes::sha256;
 use lightning::ln::PaymentSecret;
 use lightning::ln::features::InvoiceFeatures;
 #[cfg(any(doc, test))]
-use lightning::routing::network_graph::RoutingFees;
+use lightning::routing::network::RoutingFees;
 use lightning::routing::router::RouteHint;
 
 use secp256k1::key::PublicKey;
diff --git a/lightning-invoice/src/payment.rs b/lightning-invoice/src/payment.rs
@@ -31,7 +31,7 @@
 //! # use lightning::ln::channelmanager::{ChannelDetails, PaymentId, PaymentSendFailure};
 //! # use lightning::ln::msgs::LightningError;
 //! # use lightning::routing;
-//! # use lightning::routing::network_graph::NodeId;
+//! # use lightning::routing::network::NodeId;
 //! # use lightning::routing::router::{Route, RouteHop, RouteParameters};
 //! # use lightning::util::events::{Event, EventHandler, EventsProvider};
 //! # use lightning::util::logger::{Logger, Record};
@@ -458,7 +458,7 @@ mod tests {
 	use lightning::ln::features::{ChannelFeatures, NodeFeatures, InitFeatures};
 	use lightning::ln::functional_test_utils::*;
 	use lightning::ln::msgs::{ErrorAction, LightningError};
-	use lightning::routing::network_graph::NodeId;
+	use lightning::routing::network::NodeId;
 	use lightning::routing::router::{Payee, Route, RouteHop};
 	use lightning::util::test_utils::TestLogger;
 	use lightning::util::errors::APIError;
diff --git a/lightning-invoice/src/utils.rs b/lightning-invoice/src/utils.rs
@@ -12,7 +12,7 @@ use lightning::ln::{PaymentHash, PaymentSecret};
 use lightning::ln::channelmanager::{ChannelDetails, ChannelManager, PaymentId, PaymentSendFailure, MIN_FINAL_CLTV_EXPIRY};
 use lightning::ln::msgs::LightningError;
 use lightning::routing;
-use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
+use lightning::routing::network::{NetworkGraph, RoutingFees};
 use lightning::routing::router::{Route, RouteHint, RouteHintHop, RouteParameters, find_route};
 use lightning::util::logger::Logger;
 use secp256k1::key::PublicKey;
diff --git a/lightning-invoice/tests/ser_de.rs b/lightning-invoice/tests/ser_de.rs
@@ -10,7 +10,7 @@ use bitcoin_hashes::{sha256, Hash};
 use bech32::u5;
 use lightning::ln::PaymentSecret;
 use lightning::routing::router::{RouteHint, RouteHintHop};
-use lightning::routing::network_graph::RoutingFees;
+use lightning::routing::network::RoutingFees;
 use lightning_invoice::*;
 use secp256k1::PublicKey;
 use secp256k1::recovery::{RecoverableSignature, RecoveryId};
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
@@ -6539,7 +6539,7 @@ pub mod bench {
 	use ln::features::{InitFeatures, InvoiceFeatures};
 	use ln::functional_test_utils::*;
 	use ln::msgs::{ChannelMessageHandler, Init};
-	use routing::network_graph::NetworkGraph;
+	use routing::network::NetworkGraph;
 	use routing::router::{Payee, get_route};
 	use routing::scorer::Scorer;
 	use util::test_utils;
diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
@@ -15,7 +15,7 @@ use chain::channelmonitor::ChannelMonitor;
 use chain::transaction::OutPoint;
 use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
 use ln::channelmanager::{ChainParameters, ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentSendFailure, PaymentId};
-use routing::network_graph::{NetworkGossip, NetworkGraph};
+use routing::network::{NetworkGossip, NetworkGraph};
 use routing::router::{Payee, Route, get_route};
 use ln::features::{InitFeatures, InvoiceFeatures};
 use ln::msgs;
diff --git a/lightning/src/ln/functional_tests.rs b/lightning/src/ln/functional_tests.rs
@@ -23,7 +23,7 @@ use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, PaymentId, RAAC
 use ln::channel::{Channel, ChannelError};
 use ln::{chan_utils, onion_utils};
 use ln::chan_utils::HTLC_SUCCESS_TX_WEIGHT;
-use routing::network_graph::{NetworkUpdate, RoutingFees};
+use routing::network::{NetworkUpdate, RoutingFees};
 use routing::router::{Payee, Route, RouteHop, RouteHint, RouteHintHop, RouteParameters, find_route, get_route};
 use ln::features::{ChannelFeatures, InitFeatures, InvoiceFeatures, NodeFeatures};
 use ln::msgs;
diff --git a/lightning/src/ln/mod.rs b/lightning/src/ln/mod.rs
@@ -9,7 +9,7 @@
 
 //! High level lightning structs and impls live here.
 //!
-//! You probably want to create a channelmanager::ChannelManager, and a routing::network_graph::NetworkGossip first.
+//! You probably want to create a channelmanager::ChannelManager, and a routing::network::NetworkGossip first.
 //! Then, you probably want to pass them both on to a peer_handler::PeerManager and use that to
 //! create/manage connections and call get_and_clear_pending_events after each action, handling
 //! them appropriately.
diff --git a/lightning/src/ln/monitor_tests.rs b/lightning/src/ln/monitor_tests.rs
@@ -16,7 +16,7 @@ use ln::channelmanager::BREAKDOWN_TIMEOUT;
 use ln::features::InitFeatures;
 use ln::msgs::{ChannelMessageHandler, ErrorAction};
 use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason};
-use routing::network_graph::NetworkUpdate;
+use routing::network::NetworkUpdate;
 
 use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::hashes::Hash;
diff --git a/lightning/src/ln/onion_route_tests.rs b/lightning/src/ln/onion_route_tests.rs
@@ -15,7 +15,7 @@ use chain::channelmonitor::{CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS};
 use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
 use ln::channelmanager::{HTLCForwardInfo, CLTV_FAR_FAR_AWAY};
 use ln::onion_utils;
-use routing::network_graph::NetworkUpdate;
+use routing::network::NetworkUpdate;
 use routing::router::Route;
 use ln::features::InitFeatures;
 use ln::msgs;
diff --git a/lightning/src/ln/onion_utils.rs b/lightning/src/ln/onion_utils.rs
@@ -10,7 +10,7 @@
 use ln::{PaymentHash, PaymentPreimage, PaymentSecret};
 use ln::channelmanager::HTLCSource;
 use ln::msgs;
-use routing::network_graph::NetworkUpdate;
+use routing::network::NetworkUpdate;
 use routing::router::RouteHop;
 use util::chacha20::ChaCha20;
 use util::errors::{self, APIError};
diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs
@@ -27,7 +27,7 @@ use ln::wire;
 use util::atomic_counter::AtomicCounter;
 use util::events::{MessageSendEvent, MessageSendEventsProvider};
 use util::logger::Logger;
-use routing::network_graph::{NetworkGossip, NetworkGraph};
+use routing::network::{NetworkGossip, NetworkGraph};
 
 use prelude::*;
 use io;
@@ -208,7 +208,7 @@ pub struct MessageHandler<CM: Deref, RM: Deref> where
 	/// A message handler which handles messages updating our knowledge of the network channel
 	/// graph. Usually this is just a [`NetworkGossip`] object or an [`IgnoringMessageHandler`].
 	///
-	/// [`NetworkGossip`]: crate::routing::network_graph::NetworkGossip
+	/// [`NetworkGossip`]: crate::routing::network::NetworkGossip
 	pub route_handler: RM,
 }
 
diff --git a/lightning/src/ln/reorg_tests.rs b/lightning/src/ln/reorg_tests.rs
@@ -16,7 +16,7 @@ use ln::PaymentHash;
 use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs};
 use ln::features::InitFeatures;
 use ln::msgs::{ChannelMessageHandler, ErrorAction};
-use routing::network_graph::NetworkUpdate;
+use routing::network::NetworkUpdate;
 use util::enforcing_trait_impls::EnforcingSigner;
 use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason};
 use util::test_utils;
diff --git a/lightning/src/ln/shutdown_tests.rs b/lightning/src/ln/shutdown_tests.rs
@@ -14,7 +14,7 @@ use chain::transaction::OutPoint;
 use ln::{PaymentPreimage, PaymentHash};
 use ln::channelmanager::PaymentSendFailure;
 use routing::router::{Payee, get_route};
-use routing::network_graph::NetworkUpdate;
+use routing::network::NetworkUpdate;
 use ln::features::{InitFeatures, InvoiceFeatures};
 use ln::msgs;
 use ln::msgs::{ChannelMessageHandler, ErrorAction};
diff --git a/lightning/src/routing/mod.rs b/lightning/src/routing/mod.rs
@@ -13,7 +13,9 @@ pub mod network_graph;
 pub mod router;
 pub mod scorer;
 
-use routing::network_graph::NodeId;
+pub use routing::network_graph as network;
+
+use routing::network::NodeId;
 use routing::router::RouteHop;
 
 use core::cell::{RefCell, RefMut};
diff --git a/lightning/src/routing/network_graph.rs b/lightning/src/routing/network_graph.rs
@@ -1227,7 +1227,7 @@ mod tests {
 	use chain;
 	use ln::PaymentHash;
 	use ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
-	use routing::network_graph::{NetworkGossip, NetworkGraph, NetworkUpdate, MAX_EXCESS_BYTES_FOR_RELAY};
+	use routing::network::{NetworkGossip, NetworkGraph, NetworkUpdate, MAX_EXCESS_BYTES_FOR_RELAY};
 	use ln::msgs::{Init, OptionalField, RoutingMessageHandler, UnsignedNodeAnnouncement, NodeAnnouncement,
 		UnsignedChannelAnnouncement, ChannelAnnouncement, UnsignedChannelUpdate, ChannelUpdate, 
 		ReplyChannelRange, ReplyShortChannelIdsEnd, QueryChannelRange, QueryShortChannelIds, MAX_VALUE_MSAT};
diff --git a/lightning/src/routing/router.rs b/lightning/src/routing/router.rs
@@ -18,7 +18,7 @@ use ln::channelmanager::ChannelDetails;
 use ln::features::{ChannelFeatures, InvoiceFeatures, NodeFeatures};
 use ln::msgs::{DecodeError, ErrorAction, LightningError, MAX_VALUE_MSAT};
 use routing;
-use routing::network_graph::{NetworkGraph, NodeId, RoutingFees};
+use routing::network::{NetworkGraph, NodeId, RoutingFees};
 use util::ser::{Writeable, Readable};
 use util::logger::{Level, Logger};
 
@@ -1473,7 +1473,7 @@ where L::Target: Logger {
 #[cfg(test)]
 mod tests {
 	use routing;
-	use routing::network_graph::{NetworkGossip, NetworkGraph, NodeId};
+	use routing::network::{NetworkGossip, NetworkGraph, NodeId};
 	use routing::router::{get_route, Payee, Route, RouteHint, RouteHintHop, RouteHop, RoutingFees};
 	use chain::transaction::OutPoint;
 	use ln::features::{ChannelFeatures, InitFeatures, InvoiceFeatures, NodeFeatures};
diff --git a/lightning/src/routing/scorer.rs b/lightning/src/routing/scorer.rs
@@ -17,7 +17,7 @@
 //! ```
 //! # extern crate secp256k1;
 //! #
-//! # use lightning::routing::network_graph::NetworkGraph;
+//! # use lightning::routing::network::NetworkGraph;
 //! # use lightning::routing::router::{RouteParameters, find_route};
 //! # use lightning::routing::scorer::{Scorer, ScoringParameters};
 //! # use lightning::util::logger::{Logger, Record};
@@ -55,7 +55,7 @@
 use routing;
 
 use ln::msgs::DecodeError;
-use routing::network_graph::NodeId;
+use routing::network::NodeId;
 use routing::router::RouteHop;
 use util::ser::{Readable, Writeable, Writer};
 
diff --git a/lightning/src/util/events.rs b/lightning/src/util/events.rs
@@ -19,7 +19,7 @@ use ln::channelmanager::PaymentId;
 use ln::msgs;
 use ln::msgs::DecodeError;
 use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
-use routing::network_graph::NetworkUpdate;
+use routing::network::NetworkUpdate;
 use util::ser::{BigSize, FixedLengthReader, Writeable, Writer, MaybeReadable, Readable, VecReadWrapper, VecWriteWrapper};
 use routing::router::{RouteHop, RouteParameters};
 
@@ -226,8 +226,8 @@ pub enum Event {
 		/// Should be applied to the [`NetworkGraph`] so that routing decisions can take into
 		/// account the update. [`NetworkGossip`] is capable of doing this.
 		///
-		/// [`NetworkGraph`]: crate::routing::network_graph::NetworkGraph
-		/// [`NetworkGossip`]: crate::routing::network_graph::NetworkGossip
+		/// [`NetworkGraph`]: crate::routing::network::NetworkGraph
+		/// [`NetworkGossip`]: crate::routing::network::NetworkGossip
 		network_update: Option<NetworkUpdate>,
 		/// For both single-path and multi-path payments, this is set if all paths of the payment have
 		/// failed. This will be set to false if (1) this is an MPP payment and (2) other parts of the
