From abefec8ed8c73fca605b2f95c5536774811e726c Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Thu, 23 Aug 2018 15:11:59 +1000 Subject: [PATCH] Tidy "sync" module --- lighthouse/sync/mod.rs | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/lighthouse/sync/mod.rs b/lighthouse/sync/mod.rs index 516b067f84..a668093f4a 100644 --- a/lighthouse/sync/mod.rs +++ b/lighthouse/sync/mod.rs @@ -6,8 +6,6 @@ use self::futures::sync::mpsc::{ UnboundedReceiver, UnboundedSender, }; -use self::futures::Stream; -use self::tokio::timer::Interval; use self::tokio::prelude::*; use std::sync::{ RwLock, Arc }; use super::network_libp2p::message::{ @@ -17,17 +15,21 @@ use super::network_libp2p::message::{ use super::db::DB; use slog::Logger; -use std::time::{ Duration, Instant }; - type NetworkSender = UnboundedSender; type NetworkReceiver = UnboundedReceiver; type SyncSender = UnboundedSender>; type SyncReceiver = UnboundedReceiver>; +/// Start a syncing tokio future. +/// +/// This is effectively a stub function being +/// used to test network functionality. +/// +/// Expect a full re-write. pub fn start_sync( _db: Arc>, - network_tx: NetworkSender, + _network_tx: NetworkSender, network_rx: NetworkReceiver, _sync_tx: SyncSender, _sync_rx: SyncReceiver, @@ -40,20 +42,9 @@ pub fn start_sync( }) .map_err(|_| panic!("rx failed")); - let poll_future = Interval::new(Instant::now(), Duration::from_secs(2)) - .for_each(move |_| { - let msg = OutgoingMessage { - peer: None, - data: vec![42, 42, 42] - }; - network_tx.unbounded_send(msg); - Ok(()) - }) - .map_err(|_| panic!("send failed")); + /* + * This is an unfinished stub function. + */ - let sync_future = poll_future - .select(rx_future).map_err(|(err, _)| err) - .and_then(|((), n)| n); - - tokio::run(sync_future); + tokio::run(rx_future); }