Switch Logger from Arc to Deref.

[rapid-gossip-sync-server] / src / tracking.rs

diff --git a/src/tracking.rs b/src/tracking.rs
index 8d2668fcaf08ffde4128fcb6a68bfb8987e26c76..99166afdfe5e7d18a88a8b7c837bc56609dbe601 100644 (file)
--- a/src/tracking.rs
+++ b/src/tracking.rs
@@ -1,6 +1,7 @@
 use std::collections::hash_map::RandomState;
 use std::hash::{BuildHasher, Hasher};
 use std::net::SocketAddr;
+use std::ops::Deref;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 
@@ -12,15 +13,18 @@ use lightning::ln::peer_handler::{
 };
 use lightning::routing::gossip::NetworkGraph;
 use lightning::sign::KeysManager;
+use lightning::util::logger::Logger;
 use tokio::sync::mpsc;
 
-use crate::{config, TestLogger};
+use crate::config;
 use crate::downloader::GossipRouter;
 use crate::types::{GossipMessage, GossipPeerManager};
 
-pub(crate) async fn download_gossip(persistence_sender: mpsc::Sender<GossipMessage>,
+pub(crate) async fn download_gossip<L: Deref + Clone + Send + Sync + 'static>(persistence_sender: mpsc::Sender<GossipMessage>,
                completion_sender: mpsc::Sender<()>,
-               network_graph: Arc<NetworkGraph<TestLogger>>) {
+               network_graph: Arc<NetworkGraph<L>>,
+               logger: L
+) where L::Target: Logger {
        let mut key = [42; 32];
        let mut random_data = [43; 32];
        // Get something psuedo-random from std.
@@ -33,7 +37,7 @@ pub(crate) async fn download_gossip(persistence_sender: mpsc::Sender<GossipMessa
 
        let keys_manager = Arc::new(KeysManager::new(&key, 0xdeadbeef, 0xdeadbeef));
 
-       let router = Arc::new(GossipRouter::new(network_graph, persistence_sender.clone()));
+       let router = Arc::new(GossipRouter::new(network_graph, persistence_sender.clone(), logger.clone()));
 
        let message_handler = MessageHandler {
                chan_handler: ErroringMessageHandler::new(),
@@ -45,7 +49,7 @@ pub(crate) async fn download_gossip(persistence_sender: mpsc::Sender<GossipMessa
                message_handler,
                0xdeadbeef,
                &random_data,
-               TestLogger::new(),
+               logger,
                keys_manager,
        ));
        router.set_pm(Arc::clone(&peer_handler));
@@ -142,7 +146,7 @@ pub(crate) async fn download_gossip(persistence_sender: mpsc::Sender<GossipMessa
        });
 }
 
-async fn connect_peer(current_peer: (PublicKey, SocketAddr), peer_manager: GossipPeerManager) -> bool {
+async fn connect_peer<L: Deref + Clone + Send + Sync + 'static>(current_peer: (PublicKey, SocketAddr), peer_manager: GossipPeerManager<L>) -> bool where L::Target: Logger {
        eprintln!("Connecting to peer {}@{}...", current_peer.0.to_hex(), current_peer.1.to_string());
        let connection = lightning_net_tokio::connect_outbound(
                Arc::clone(&peer_manager),