From 17b93523bdc383520d8ffbc6f9add46d6edf405c Mon Sep 17 00:00:00 2001
From: Henry de Valence <hdevalence@hdevalence.ca>
Date: Tue, 15 Oct 2019 17:07:59 -0700
Subject: [PATCH] Restore PeerSet code in connect stub.

This was commented out because making the PeerConnector take a TcpStream
meant that the PeerConnector futures couldn't be constructed in the same
way as before, but now that the PeerConnector is Buffer'able, we can
just clone a buffered copy.
---
 zebrad/src/commands/connect.rs | 22 +++++++++++++++-------
 zebrad/src/prelude.rs          |  7 +++++++
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/zebrad/src/commands/connect.rs b/zebrad/src/commands/connect.rs
index 4ff64f42..66f1347b 100644
--- a/zebrad/src/commands/connect.rs
+++ b/zebrad/src/commands/connect.rs
@@ -77,14 +77,19 @@ impl ConnectCmd {
 
         let config = app_config().network.clone();
         let collector = TimestampCollector::new();
-        let mut pc = PeerConnector::new(config, Network::Mainnet, node, &collector);
+        let mut pc = Buffer::new(
+            PeerConnector::new(config, Network::Mainnet, node, &collector),
+            1,
+        );
 
         let tcp_stream = TcpStream::connect(self.addr).await?;
         pc.ready()
-            .await?;
+            .await
+            .map_err(failure::Error::from_boxed_compat)?;
         let mut client = pc
             .call((tcp_stream, self.addr))
-            .await?;
+            .await
+            .map_err(failure::Error::from_boxed_compat)?;
 
         client.ready().await?;
 
@@ -97,7 +102,6 @@ impl ConnectCmd {
             "got addresses from first connected peer"
         );
 
-/*
         use failure::Error;
         use futures::{
             future,
@@ -113,8 +117,13 @@ impl ConnectCmd {
                 addrs
                     .into_iter()
                     .map(|meta| {
-                        let svc_fut = pc.call(meta.addr);
-                        async move { Ok::<_, Error>(Change::Insert(meta.addr, svc_fut.await?)) }
+                        let mut pc = pc.clone();
+                        async move {
+                            let stream = TcpStream::connect(meta.addr).await?;
+                            pc.ready().await?;
+                            let client = pc.call((stream, meta.addr)).await?;
+                            Ok::<_, BoxedStdError>(Change::Insert(meta.addr, client))
+                        }
                     })
                     .collect::<FuturesUnordered<_>>()
                     // Discard any errored connections...
@@ -156,7 +165,6 @@ impl ConnectCmd {
             // empty loop ensures we don't exit the application,
             // and this is throwaway code
         }
-        */
 
         Ok(())
     }
diff --git a/zebrad/src/prelude.rs b/zebrad/src/prelude.rs
index 3d593840..7891c887 100644
--- a/zebrad/src/prelude.rs
+++ b/zebrad/src/prelude.rs
@@ -10,3 +10,10 @@ pub use abscissa_core::{Application, Command, Runnable};
 // These are disabled because we use tracing.
 // Logging macros
 //pub use abscissa_core::log::{debug, error, info, log, log_enabled, trace, warn};
+
+/// Type alias to make working with tower traits easier.
+///
+/// Note: the 'static lifetime bound means that the *type* cannot have any
+/// non-'static lifetimes, (e.g., when a type contains a borrow and is
+/// parameterized by 'a), *not* that the object itself has 'static lifetime.
+pub(crate) type BoxedStdError = Box<dyn std::error::Error + Send + Sync + 'static>;