Bump tokio to 1.1 (#15926)

(cherry picked from commit 654449c)
solana-labs · Mar 16, 2021 · ae4a48d · ae4a48d
1 parent a259ff0
commit ae4a48d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 42 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml
@@ -52,7 +52,8 @@ solana-storage-proto = { path = "../storage-proto", version = "=1.6.1" }
 solana-vote-program = { path = "../programs/vote", version = "=1.6.1" }
 tempfile = "3.1.0"
 thiserror = "1.0"
-tokio = { version = "0.3", features = ["full"] }
+tokio = { version = "1.1", features = ["full"] }
+tokio-stream = "0.1"
 trees = "0.2.1"
 
 [dependencies.rocksdb]

diff --git a/ledger/src/bigtable_upload.rs b/ledger/src/bigtable_upload.rs
@@ -168,7 +168,7 @@ pub async fn upload_confirmed_blocks(
     use futures::stream::StreamExt;
 
     let mut stream =
-        tokio::stream::iter(receiver.into_iter()).chunks(NUM_BLOCKS_TO_UPLOAD_IN_PARALLEL);
+        tokio_stream::iter(receiver.into_iter()).chunks(NUM_BLOCKS_TO_UPLOAD_IN_PARALLEL);
 
     while let Some(blocks) = stream.next().await {
         if exit.load(Ordering::Relaxed) {