From ecf2d75307c6b45788d8b669e088b4b9e6cdf4ea Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Fri, 5 Aug 2022 19:50:45 -0700 Subject: [PATCH] Unpin tokio for non-rpc crates (#26957) --- banks-server/Cargo.toml | 2 +- client/Cargo.toml | 2 +- faucet/Cargo.toml | 2 +- ledger-tool/Cargo.toml | 2 +- ledger/Cargo.toml | 2 +- net-utils/Cargo.toml | 2 +- program-test/Cargo.toml | 2 +- storage-bigtable/Cargo.toml | 2 +- streamer/Cargo.toml | 2 +- test-validator/Cargo.toml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/banks-server/Cargo.toml b/banks-server/Cargo.toml index 518340f77d1448..52d8b6426354b4 100644 --- a/banks-server/Cargo.toml +++ b/banks-server/Cargo.toml @@ -19,7 +19,7 @@ solana-runtime = { path = "../runtime", version = "=1.11.6" } solana-sdk = { path = "../sdk", version = "=1.11.6" } solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.11.6" } tarpc = { version = "0.29.0", 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 index a7a0eaf2b45996..24aea853e656dc 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -51,7 +51,7 @@ solana-version = { path = "../version", version = "=1.11.6" } solana-vote-program = { path = "../programs/vote", version = "=1.11.6" } spl-token-2022 = { version = "=0.4.2", features = ["no-entrypoint"] } thiserror = "1.0" -tokio = { version = "~1.14.1", features = ["full"] } +tokio = { version = "1", features = ["full"] } tokio-stream = "0.1.9" 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 index 7ef1507d38857d..4e73f2c7ecd8dc 100644 --- a/faucet/Cargo.toml +++ b/faucet/Cargo.toml @@ -25,7 +25,7 @@ solana-sdk = { path = "../sdk", version = "=1.11.6" } solana-version = { path = "../version", version = "=1.11.6" } 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 index 6c138e395ac409..54282ba3db6666 100644 --- a/ledger-tool/Cargo.toml +++ b/ledger-tool/Cargo.toml @@ -36,7 +36,7 @@ solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.11.6" } solana-transaction-status = { path = "../transaction-status", version = "=1.11.6" } solana-version = { path = "../version", version = "=1.11.6" } solana-vote-program = { path = "../programs/vote", version = "=1.11.6" } -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 index dfc87eae64d7bf..c2d18be9451ef7 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -56,7 +56,7 @@ spl-token-2022 = { version = "=0.4.2", features = ["no-entrypoint"] } static_assertions = "1.1.0" 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 index 6d37c010d8cb3f..1a92092a4bf538 100644 --- a/net-utils/Cargo.toml +++ b/net-utils/Cargo.toml @@ -22,7 +22,7 @@ socket2 = "0.4.4" solana-logger = { path = "../logger", version = "=1.11.6" } solana-sdk = { path = "../sdk", version = "=1.11.6" } solana-version = { path = "../version", version = "=1.11.6" } -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 index 1d84c0d5aa9218..abf3326f50ef7a 100644 --- a/program-test/Cargo.toml +++ b/program-test/Cargo.toml @@ -24,4 +24,4 @@ solana-runtime = { path = "../runtime", version = "=1.11.6" } solana-sdk = { path = "../sdk", version = "=1.11.6" } solana-vote-program = { path = "../programs/vote", version = "=1.11.6" } 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 index f2a188a43ff0e3..e3b8205f98e38e 100644 --- a/storage-bigtable/Cargo.toml +++ b/storage-bigtable/Cargo.toml @@ -32,7 +32,7 @@ solana-sdk = { path = "../sdk", version = "=1.11.6" } solana-storage-proto = { path = "../storage-proto", version = "=1.11.6" } solana-transaction-status = { path = "../transaction-status", version = "=1.11.6" } thiserror = "1.0" -tokio = "~1.14.1" +tokio = "1" tonic = { version = "0.8.0", features = ["tls", "transport"] } zstd = "0.11.2" diff --git a/streamer/Cargo.toml b/streamer/Cargo.toml index bfb38884a08645..a788d7cfa4b8f5 100644 --- a/streamer/Cargo.toml +++ b/streamer/Cargo.toml @@ -29,7 +29,7 @@ solana-metrics = { path = "../metrics", version = "=1.11.6" } solana-perf = { path = "../perf", version = "=1.11.6" } solana-sdk = { path = "../sdk", version = "=1.11.6" } 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 index 025614811b7e06..09aaf5566e9045 100644 --- a/test-validator/Cargo.toml +++ b/test-validator/Cargo.toml @@ -28,7 +28,7 @@ solana-rpc = { path = "../rpc", version = "=1.11.6" } solana-runtime = { path = "../runtime", version = "=1.11.6" } solana-sdk = { path = "../sdk", version = "=1.11.6" } solana-streamer = { path = "../streamer", version = "=1.11.6" } -tokio = { version = "~1.14.1", features = ["full"] } +tokio = { version = "1", features = ["full"] } [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"]