From af10275f4606a865cb032cf70583f71f46c42b90 Mon Sep 17 00:00:00 2001
From: OlivierDehaene <23298448+OlivierDehaene@users.noreply.github.com>
Date: Sun, 9 Apr 2023 15:10:59 +0200
Subject: [PATCH] use join_all instead

---
 router/client/src/sharded_client.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/router/client/src/sharded_client.rs b/router/client/src/sharded_client.rs
index 7f0ec6f2..e212088e 100644
--- a/router/client/src/sharded_client.rs
+++ b/router/client/src/sharded_client.rs
@@ -60,9 +60,8 @@ impl ShardedClient {
             .iter_mut()
             .map(|client| Box::pin(client.prefill(batch.clone())))
             .collect();
-        // As soon as we receive one response, we can return as all shards will return the same
-        let (result, _, _) = select_all(futures).await;
-        result
+        // all shards return the same message
+        join_all(futures).await.pop().unwrap()
     }
 
     /// Generate one token for each request in the given cached batches
@@ -79,8 +78,7 @@ impl ShardedClient {
             .iter_mut()
             .map(|client| Box::pin(client.decode(batches.clone())))
             .collect();
-        // As soon as we receive one response, we can return as all shards will return the same
-        let (result, _, _) = select_all(futures).await;
-        result
+        // all shards return the same message
+        join_all(futures).await.pop().unwrap()
     }
 }