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