Unpin tokio for non-rpc crates (backport #26957) (#26964)

* Unpin tokio for non-rpc crates (#26957) (cherry picked from commit 66919e5) # Conflicts: # banks-server/Cargo.toml # client/Cargo.toml # ledger-tool/Cargo.toml # net-utils/Cargo.toml # storage-bigtable/Cargo.toml # test-validator/Cargo.toml * Fix conflicts Co-authored-by: Tyera Eulberg <[email protected]>
solana-labs · Aug 6, 2022 · a2f51a6 · a2f51a6
1 parent 41ee5d6
commit a2f51a6
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/banks-server/Cargo.toml b/banks-server/Cargo.toml
@@ -19,7 +19,7 @@ solana-runtime = { path = "../runtime", version = "=1.10.35" }
 solana-sdk = { path = "../sdk", version = "=1.10.35" }
 solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.35" }
 tarpc = { version = "0.27.2", features = ["full"] }
-tokio = { version = "~1.14.1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }
 tokio-stream = "0.1"
 

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -52,7 +52,7 @@ solana-version = { path = "../version", version = "=1.10.35" }
 solana-vote-program = { path = "../programs/vote", version = "=1.10.35" }
 spl-token-2022 = { version = "=0.4.1", features = ["no-entrypoint"] }
 thiserror = "1.0"
-tokio = { version = "~1.14.1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
 tokio-stream = "0.1.8"
 tokio-tungstenite = { version = "0.17.1", features = ["rustls-tls-webpki-roots"] }
 tungstenite = { version = "0.17.2", features = ["rustls-tls-webpki-roots"] }

diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
@@ -25,7 +25,7 @@ solana-sdk = { path = "../sdk", version = "=1.10.35" }
 solana-version = { path = "../version", version = "=1.10.35" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 thiserror = "1.0"
-tokio = { version = "~1.14.1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
 
 [lib]
 crate-type = ["lib"]

diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml
@@ -35,7 +35,7 @@ solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.10.35" }
 solana-transaction-status = { path = "../transaction-status", version = "=1.10.35" }
 solana-version = { path = "../version", version = "=1.10.35" }
 solana-vote-program = { path = "../programs/vote", version = "=1.10.35" }
-tokio = { version = "~1.14.1", features = ["full"] }
+tokio = { version = "~1", features = ["full"] }
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 jemallocator = { package = "tikv-jemallocator", version = "0.4.1", features = ["unprefixed_malloc_on_supported_platforms"] }

diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml
@@ -53,7 +53,7 @@ spl-token = { version = "=3.3.1", features = ["no-entrypoint"] }
 spl-token-2022 = { version = "=0.2.0", features = ["no-entrypoint"] }
 tempfile = "3.3.0"
 thiserror = "1.0"
-tokio = { version = "~1.14.1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
 tokio-stream = "0.1"
 trees = "0.4.2"
 

diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
@@ -22,7 +22,7 @@ socket2 = "0.4.4"
 solana-logger = { path = "../logger", version = "=1.10.35" }
 solana-sdk = { path = "../sdk", version = "=1.10.35" }
 solana-version = { path = "../version", version = "=1.10.35" }
-tokio = { version = "~1.14.1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
 url = "2.2.2"
 
 [lib]

diff --git a/program-test/Cargo.toml b/program-test/Cargo.toml
@@ -23,4 +23,4 @@ solana-runtime = { path = "../runtime", version = "=1.10.35" }
 solana-sdk = { path = "../sdk", version = "=1.10.35" }
 solana-vote-program = { path = "../programs/vote", version = "=1.10.35" }
 thiserror = "1.0"
-tokio = { version = "~1.14.1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
diff --git a/storage-bigtable/Cargo.toml b/storage-bigtable/Cargo.toml
@@ -32,7 +32,7 @@ solana-sdk = { path = "../sdk", version = "=1.10.35" }
 solana-storage-proto = { path = "../storage-proto", version = "=1.10.35" }
 solana-transaction-status = { path = "../transaction-status", version = "=1.10.35" }
 thiserror = "1.0"
-tokio = "~1.14.1"
+tokio = "1"
 tonic = { version = "0.7.1", features = ["tls", "transport"] }
 zstd = "0.11.1"
 

diff --git a/streamer/Cargo.toml b/streamer/Cargo.toml
@@ -29,7 +29,7 @@ solana-metrics = { path = "../metrics", version = "=1.10.35" }
 solana-perf = { path = "../perf", version = "=1.10.35" }
 solana-sdk = { path = "../sdk", version = "=1.10.35" }
 thiserror = "1.0"
-tokio = { version = "~1.14.1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
 x509-parser = "0.14.0"
 
 [dev-dependencies]

diff --git a/test-validator/Cargo.toml b/test-validator/Cargo.toml
@@ -27,7 +27,7 @@ solana-rpc = { path = "../rpc", version = "=1.10.35" }
 solana-runtime = { path = "../runtime", version = "=1.10.35" }
 solana-sdk = { path = "../sdk", version = "=1.10.35" }
 solana-streamer = { path = "../streamer", version = "=1.10.35" }
-tokio = { version = "~1.14.1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]