From a02a00a3f54ce943dbb8792aa5b1466ef8ef58a6 Mon Sep 17 00:00:00 2001 From: teor Date: Mon, 15 Feb 2021 11:31:59 +1000 Subject: [PATCH] Revert "Stop using CallAllUnordered in peer_set::add_initial_peers (#1705)" This reverts commit 241c7ad849817f108297ecaff739ebe676badbb6. --- zebra-network/src/peer_set/initialize.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/zebra-network/src/peer_set/initialize.rs b/zebra-network/src/peer_set/initialize.rs index 5e6a939e..0d5e8afa 100644 --- a/zebra-network/src/peer_set/initialize.rs +++ b/zebra-network/src/peer_set/initialize.rs @@ -194,10 +194,9 @@ where S::Future: Send + 'static, { info!(?initial_peers, "Connecting to initial peer set"); - let mut handshakes = initial_peers - .iter() - .map(|request| connector.clone().oneshot(*request)) - .collect::>(); + use tower::util::CallAllUnordered; + let addr_stream = futures::stream::iter(initial_peers.into_iter()); + let mut handshakes = CallAllUnordered::new(connector, addr_stream); while let Some(handshake_result) = handshakes.next().await { tx.send(handshake_result).await?;