Allow custom logger types.

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

diff --git a/src/tracking.rs b/src/tracking.rs
index 810a037828c328e0fc8f6e38dbcf25d4c1272552..2935eb286780b8228d1d4f6123de370e71b3cbb1 100644 (file)
--- a/src/tracking.rs
+++ b/src/tracking.rs
@@ -5,21 +5,25 @@ use std::sync::Arc;
 use std::time::{Duration, Instant};
 
 use bitcoin::hashes::hex::ToHex;
-use bitcoin::secp256k1::{PublicKey, SecretKey};
+use bitcoin::secp256k1::PublicKey;
 use lightning;
 use lightning::ln::peer_handler::{
        ErroringMessageHandler, IgnoringMessageHandler, MessageHandler, PeerManager,
 };
 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: Logger + Send + Sync + 'static>(persistence_sender: mpsc::Sender<GossipMessage>,
                completion_sender: mpsc::Sender<()>,
-               network_graph: Arc<NetworkGraph<TestLogger>>) {
+               network_graph: Arc<NetworkGraph<Arc<L>>>,
+               logger: Arc<L>
+) {
        let mut key = [42; 32];
        let mut random_data = [43; 32];
        // Get something psuedo-random from std.
@@ -30,22 +34,33 @@ pub(crate) async fn download_gossip(persistence_sender: mpsc::Sender<GossipMessa
        rand_hasher.write_u8(2);
        random_data[0..8].copy_from_slice(&rand_hasher.finish().to_ne_bytes());
 
-       let our_node_secret = SecretKey::from_slice(&key).unwrap();
-       let router = Arc::new(GossipRouter::new(network_graph, persistence_sender.clone()));
+       let keys_manager = Arc::new(KeysManager::new(&key, 0xdeadbeef, 0xdeadbeef));
+
+       let router = Arc::new(GossipRouter::new(network_graph, persistence_sender.clone(), logger.clone()));
 
        let message_handler = MessageHandler {
                chan_handler: ErroringMessageHandler::new(),
                route_handler: Arc::clone(&router),
                onion_message_handler: IgnoringMessageHandler {},
+               custom_message_handler: IgnoringMessageHandler {},
        };
        let peer_handler = Arc::new(PeerManager::new(
                message_handler,
-               our_node_secret,
                0xdeadbeef,
                &random_data,
-               TestLogger::new(),
-               IgnoringMessageHandler {},
+               logger,
+               keys_manager,
        ));
+       router.set_pm(Arc::clone(&peer_handler));
+
+       let ph_timer = Arc::clone(&peer_handler);
+       tokio::spawn(async move {
+               let mut intvl = tokio::time::interval(Duration::from_secs(10));
+               loop {
+                       intvl.tick().await;
+                       ph_timer.timer_tick_occurred();
+               }
+       });
 
        println!("Connecting to Lightning peers...");
        let peers = config::ln_peers();
@@ -130,7 +145,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: Logger + Send + Sync + 'static>(current_peer: (PublicKey, SocketAddr), peer_manager: GossipPeerManager<L>) -> bool {
        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),
@@ -149,9 +164,8 @@ async fn connect_peer(current_peer: (PublicKey, SocketAddr), peer_manager: Gossi
                                        current_peer.1,
                                ).await {
                                        disconnection_future.await;
-                               } else {
-                                       tokio::time::sleep(Duration::from_secs(10)).await;
                                }
+                               tokio::time::sleep(Duration::from_secs(10)).await;
                        }
                });
                true