Move routing stuff to a separate module

Author: naumenkogs

fuzz/src/chanmon_consistency.rs

@@ -28,7 +28,7 @@ use lightning::chain::keysinterface::{KeysInterface, InMemoryChannelKeys};
 use lightning::ln::channelmonitor;
 use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
 use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, PaymentSecret, ChannelManagerReadArgs};
-use lightning::ln::router::{Route, RouteHop};
+use lightning::routing::router::{Route, RouteHop};
 use lightning::ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
 use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, UpdateAddHTLC, Init};
 use lightning::util::enforcing_trait_impls::EnforcingChannelKeys;

fuzz/src/full_stack.rs

@@ -24,8 +24,8 @@ use lightning::chain::keysinterface::{InMemoryChannelKeys, KeysInterface};
 use lightning::ln::channelmonitor;
 use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, PaymentSecret};
 use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
-use lightning::ln::router::Router;
-use lightning::ln::network_graph::NetworkGraph;
+use lightning::routing::router::Router;
+use lightning::routing::network_graph::NetworkGraph;
 use lightning::util::events::{EventsProvider,Event};
 use lightning::util::enforcing_trait_impls::EnforcingChannelKeys;
 use lightning::util::logger::Logger;

fuzz/src/router.rs

@@ -8,10 +8,10 @@ use lightning::ln::channelmanager::ChannelDetails;
 use lightning::ln::features::InitFeatures;
 use lightning::ln::msgs;
 use lightning::ln::msgs::RoutingMessageHandler;
-use lightning::ln::router::{Router, RouteHint};
+use lightning::routing::router::{Router, RouteHint};
 use lightning::util::logger::Logger;
 use lightning::util::ser::Readable;
-use lightning::ln::network_graph::{NetworkGraph, RoutingFees};
+use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
 
 use secp256k1::key::PublicKey;
 

lightning/src/lib.rs

@@ -28,3 +28,4 @@ extern crate secp256k1;
 pub mod util;
 pub mod chain;
 pub mod ln;
+pub mod routing;

lightning/src/ln/channelmanager.rs

@@ -30,7 +30,7 @@ use chain::transaction::OutPoint;
 use ln::channel::{Channel, ChannelError};
 use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr, ManyChannelMonitor, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY};
 use ln::features::{InitFeatures, NodeFeatures};
-use ln::router::{Route, RouteHop};
+use routing::router::{Route, RouteHop};
 use ln::msgs;
 use ln::onion_utils;
 use ln::msgs::{ChannelMessageHandler, DecodeError, LightningError};

lightning/src/ln/functional_test_utils.rs

@@ -6,8 +6,8 @@ use chain::transaction::OutPoint;
 use chain::keysinterface::KeysInterface;
 use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, RAACommitmentOrder, PaymentPreimage, PaymentHash, PaymentSecret, PaymentSendFailure};
 use ln::channelmonitor::{ChannelMonitor, ManyChannelMonitor};
-use ln::router::{Route, Router};
-use ln::network_graph::{NetworkGraph, NetworkGraphReadArgs};
+use routing::router::{Route, Router};
+use routing::network_graph::{NetworkGraph, NetworkGraphReadArgs};
 use ln::features::InitFeatures;
 use ln::msgs;
 use ln::msgs::{ChannelMessageHandler,RoutingMessageHandler};

lightning/src/ln/functional_tests.rs

@@ -12,7 +12,7 @@ use ln::channelmonitor::{ChannelMonitor, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD
 use ln::channelmonitor;
 use ln::channel::{Channel, ChannelError};
 use ln::{chan_utils, onion_utils};
-use ln::router::{Route, RouteHop};
+use routing::router::{Route, RouteHop};
 use ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
 use ln::msgs;
 use ln::msgs::{ChannelMessageHandler,RoutingMessageHandler,HTLCFailChannelUpdate, ErrorAction};

lightning/src/ln/mod.rs

@@ -1,6 +1,6 @@
 //! High level lightning structs and impls live here.
 //!
-//! You probably want to create a channelmanager::ChannelManager, and a router::Router first.
+//! You probably want to create a channelmanager::ChannelManager, and a routing::router::Router 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.
@@ -12,8 +12,6 @@
 pub mod channelmanager;
 pub mod channelmonitor;
 pub mod msgs;
-pub mod router;
-pub mod network_graph;
 pub mod peer_handler;
 pub mod chan_utils;
 pub mod features;

lightning/src/ln/onion_utils.rs

@@ -1,6 +1,6 @@
 use ln::channelmanager::{PaymentHash, PaymentSecret, HTLCSource};
 use ln::msgs;
-use ln::router::RouteHop;
+use routing::router::RouteHop;
 use util::byte_utils;
 use util::chacha20::ChaCha20;
 use util::errors::{self, APIError};
@@ -472,7 +472,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing>(secp_ctx: &Secp256k1<
 mod tests {
 	use ln::channelmanager::PaymentHash;
 	use ln::features::{ChannelFeatures, NodeFeatures};
-	use ln::router::{Route, RouteHop};
+	use routing::router::{Route, RouteHop};
 	use ln::msgs;
 	use util::ser::{Writeable, Writer};
 

lightning/src/routing/mod.rs

@@ -0,0 +1,4 @@
+//! Structs and impls for receiving messages about the network and storing the topology live here.
+
+pub mod router;
+pub mod network_graph;

lightning/src/ln/network_graph.rs renamed to lightning/src/routing/network_graph.rs

@@ -756,7 +756,7 @@ impl RoutingMessageHandler for NetworkGraph {
 mod tests {
 	use chain::chaininterface;
 	use ln::features::{ChannelFeatures, NodeFeatures};
-	use ln::network_graph::{NetworkGraph, NetworkMap, DirectionalChannelInfo, ChannelInfo, NodeInfo, RoutingFees};
+	use routing::network_graph::{NetworkGraph, NetworkMap, DirectionalChannelInfo, ChannelInfo, NodeInfo, RoutingFees};
 	use ln::msgs::{RoutingMessageHandler, UnsignedNodeAnnouncement, NodeAnnouncement,
 	   UnsignedChannelAnnouncement, ChannelAnnouncement, UnsignedChannelUpdate, ChannelUpdate, HTLCFailChannelUpdate};
 	use util::test_utils;

lightning/src/ln/router.rs renamed to lightning/src/routing/router.rs

@@ -8,7 +8,7 @@ use secp256k1::key::PublicKey;
 use ln::channelmanager;
 use ln::features::{ChannelFeatures, NodeFeatures};
 use ln::msgs::{DecodeError,ErrorAction,LightningError};
-use ln::network_graph::{NetworkGraph, RoutingFees};
+use routing::network_graph::{NetworkGraph, RoutingFees};
 use util::ser::{Writeable, Readable};
 use util::logger::Logger;
 
@@ -401,8 +401,8 @@ impl Router {
 #[cfg(test)]
 mod tests {
 	use chain::chaininterface;
-	use ln::network_graph::{NetworkGraph, NodeInfo, NetworkMap, ChannelInfo, DirectionalChannelInfo, RoutingFees};
-	use ln::router::{Router, RouteHint};
+	use routing::network_graph::{NetworkGraph, NodeInfo, NetworkMap, ChannelInfo, DirectionalChannelInfo, RoutingFees};
+	use routing::router::{Router, RouteHint};
 	use ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
 	use ln::msgs::{ErrorAction, LightningError};
 	use ln::channelmanager;

lightning/src/util/macro_logger.rs

@@ -5,7 +5,7 @@ use bitcoin_hashes::sha256d::Hash as Sha256dHash;
 use bitcoin::blockdata::transaction::Transaction;
 use secp256k1::key::PublicKey;
 
-use ln::router::Route;
+use routing::router::Route;
 use ln::chan_utils::HTLCType;
 
 use std;