refactor using combination of traits for a single referance

Author: SWvheerden

src/ln/msgs.rs

@@ -564,14 +564,18 @@ pub trait RoutingMessageHandler : Send + Sync {
 	fn handle_htlc_fail_channel_update(&self, update: &HTLCFailChannelUpdate);
 }
 
-///A trait to describe the API required to access the network topology
-pub trait NetworkAPI : Send + Sync {
+///A trait to describe the functions required to access the local network topology
+pub trait NetworkTopology : Send + Sync {
 	///This should return a vec of all possible channel announcements or an error
 	fn get_all_channel_announcements(&self)-> Result<Vec<ChannelAnnouncement>, std::fmt::Error>;
 	///This should return a vec of all possible node announcements or an error
 	fn get_all_node_announcements(&self)-> Result<Vec<NodeAnnouncement>, std::fmt::Error>;
 }
 
+///this is a combination trait of NetworkTopology and RoutingMerssageHandler
+pub trait NetworkAPI : RoutingMessageHandler + NetworkTopology{}
+impl<T> NetworkAPI for T where T: RoutingMessageHandler+NetworkTopology{}
+
 pub(crate) struct OnionRealm0HopData {
 	pub(crate) short_channel_id: u64,
 	pub(crate) amt_to_forward: u64,

src/ln/peer_handler.rs

@@ -28,7 +28,7 @@ pub struct MessageHandler {
 	pub chan_handler: Arc<msgs::ChannelMessageHandler>,
 	/// A message handler which handles messages updating our knowledge of the network channel
 	/// graph. Usually this is just a Router object.
-	pub route_handler: Arc<msgs::RoutingMessageHandler>,
+	pub route_handler: Arc<msgs::NetworkAPI>,
 }
 
 /// Provides an object which can be used to send data to and which uniquely identifies a connection
@@ -131,7 +131,6 @@ pub struct PeerManager<Descriptor: SocketDescriptor> {
 	pending_events: Mutex<Vec<Event>>,
 	our_node_secret: SecretKey,
 	initial_syncs_sent: AtomicUsize,
-	network_api : NetworkAPI,
 	logger: Arc<Logger>,
 }
 

src/ln/router.rs

@@ -13,7 +13,7 @@ use bitcoin::blockdata::opcodes;
 
 use chain::chaininterface::{ChainError, ChainWatchInterface};
 use ln::channelmanager;
-use ln::msgs::{ErrorAction,HandleError,RoutingMessageHandler,NetAddress,GlobalFeatures, NetworkAPI};
+use ln::msgs::{ErrorAction,HandleError,RoutingMessageHandler,NetAddress,GlobalFeatures,NetworkTopology};
 use ln::msgs;
 use util::ser::Writeable;
 use util::logger::Logger;
@@ -428,8 +428,8 @@ impl RoutingMessageHandler for Router {
 	}
 }
 
-impl NetworkAPI for Router {
-	fn get_all_channel_announcements(&self)-> Result<Vec<msgs::NodeAnnouncement>, std::fmt::Error>{
+impl NetworkTopology for Router {
+	fn get_all_channel_announcements(&self)-> Result<Vec<msgs::ChannelAnnouncement>, std::fmt::Error>{
 		unimplemented!();
 	}
 	fn get_all_node_announcements(&self)-> Result<Vec<msgs::NodeAnnouncement>, std::fmt::Error>{