X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fdownloader.rs;h=0c672e36446c25d05d6dcf48905f67a47feb7d35;hb=2cf9129a187a66cfed10f9583c14fc8ee7339a18;hp=ac11ec7091739f62290274c9637af2910b3484e4;hpb=db63107f5807066ed9eeb7e4212dd0bfbae5ad8a;p=rapid-gossip-sync-server

diff --git a/src/downloader.rs b/src/downloader.rs
index ac11ec7..0c672e3 100644
--- a/src/downloader.rs
+++ b/src/downloader.rs
@@ -5,10 +5,10 @@ use lightning::events::{MessageSendEvent, MessageSendEventsProvider};
 use lightning::ln::features::{InitFeatures, NodeFeatures};
 use lightning::ln::msgs::{ChannelAnnouncement, ChannelUpdate, Init, LightningError, NodeAnnouncement, QueryChannelRange, QueryShortChannelIds, ReplyChannelRange, ReplyShortChannelIdsEnd, RoutingMessageHandler};
 use lightning::routing::gossip::{NetworkGraph, NodeId, P2PGossipSync};
+use lightning::util::logger::Logger;
 use tokio::sync::mpsc;
 use tokio::sync::mpsc::error::TrySendError;
 
-use crate::TestLogger;
 use crate::types::{GossipMessage, GossipChainAccess, GossipPeerManager};
 use crate::verifier::ChainVerifier;
 
@@ -30,28 +30,28 @@ impl GossipCounter {
 	}
 }
 
-pub(crate) struct GossipRouter {
-	native_router: P2PGossipSync<Arc<NetworkGraph<TestLogger>>, GossipChainAccess, TestLogger>,
+pub(crate) struct GossipRouter<L: Logger + Send + Sync + 'static> {
+	native_router: P2PGossipSync<Arc<NetworkGraph<Arc<L>>>, GossipChainAccess<L>, Arc<L>>,
 	pub(crate) counter: RwLock<GossipCounter>,
 	sender: mpsc::Sender<GossipMessage>,
-	verifier: Arc<ChainVerifier>,
-	outbound_gossiper: Arc<P2PGossipSync<Arc<NetworkGraph<TestLogger>>, GossipChainAccess, TestLogger>>,
+	verifier: Arc<ChainVerifier<L>>,
+	outbound_gossiper: Arc<P2PGossipSync<Arc<NetworkGraph<Arc<L>>>, GossipChainAccess<L>, Arc<L>>>,
 }
 
-impl GossipRouter {
-	pub(crate) fn new(network_graph: Arc<NetworkGraph<TestLogger>>, sender: mpsc::Sender<GossipMessage>) -> Self {
-		let outbound_gossiper = Arc::new(P2PGossipSync::new(Arc::clone(&network_graph), None, TestLogger::new()));
+impl<L: Logger + Send + Sync> GossipRouter<L> {
+	pub(crate) fn new(network_graph: Arc<NetworkGraph<Arc<L>>>, sender: mpsc::Sender<GossipMessage>, logger: Arc<L>) -> Self {
+		let outbound_gossiper = Arc::new(P2PGossipSync::new(Arc::clone(&network_graph), None, logger.clone()));
 		let verifier = Arc::new(ChainVerifier::new(Arc::clone(&network_graph), Arc::clone(&outbound_gossiper)));
 		Self {
-			native_router: P2PGossipSync::new(network_graph, Some(Arc::clone(&verifier)), TestLogger::new()),
+			native_router: P2PGossipSync::new(network_graph, Some(Arc::clone(&verifier)), logger.clone()),
 			outbound_gossiper,
 			counter: RwLock::new(GossipCounter::new()),
 			sender,
-			verifier,
+			verifier
 		}
 	}
 
-	pub(crate) fn set_pm(&self, peer_handler: GossipPeerManager) {
+	pub(crate) fn set_pm(&self, peer_handler: GossipPeerManager<L>) {
 		self.verifier.set_ph(peer_handler);
 	}
 
@@ -83,7 +83,7 @@ impl GossipRouter {
 	}
 }
 
-impl MessageSendEventsProvider for GossipRouter {
+impl<L: Logger + Send + Sync> MessageSendEventsProvider for GossipRouter<L> {
 	fn get_and_clear_pending_msg_events(&self) -> Vec<MessageSendEvent> {
 		let gossip_evs = self.outbound_gossiper.get_and_clear_pending_msg_events();
 		for ev in gossip_evs {
@@ -102,7 +102,7 @@ impl MessageSendEventsProvider for GossipRouter {
 	}
 }
 
-impl RoutingMessageHandler for GossipRouter {
+impl<L: Logger + Send + Sync> RoutingMessageHandler for GossipRouter<L> {
 	fn handle_node_announcement(&self, msg: &NodeAnnouncement) -> Result<bool, LightningError> {
 		self.native_router.handle_node_announcement(msg)
 	}