From dbda76ce0271bd0e037ad39b97901b4257e8a703 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) (cherry picked from commit 66919e5adb15a28230e0deb05b8dee1a3a7907ed) # Conflicts: # banks-server/Cargo.toml # client/Cargo.toml # ledger-tool/Cargo.toml # net-utils/Cargo.toml # storage-bigtable/Cargo.toml # test-validator/Cargo.toml --- banks-server/Cargo.toml | 10 ++++++++++ client/Cargo.toml | 5 +++++ faucet/Cargo.toml | 2 +- ledger-tool/Cargo.toml | 19 +++++++++++++++++++ ledger/Cargo.toml | 2 +- net-utils/Cargo.toml | 7 +++++++ program-test/Cargo.toml | 2 +- storage-bigtable/Cargo.toml | 6 ++++++ streamer/Cargo.toml | 2 +- test-validator/Cargo.toml | 18 ++++++++++++++++++ 10 files changed, 69 insertions(+), 4 deletions(-) diff --git a/banks-server/Cargo.toml b/banks-server/Cargo.toml index a30f05bcebf20a..7f07705c6db17a 100644 --- a/banks-server/Cargo.toml +++ b/banks-server/Cargo.toml @@ -13,6 +13,7 @@ edition = "2021" bincode = "1.3.3" crossbeam-channel = "0.5" futures = "0.3" +<<<<<<< HEAD solana-banks-interface = { path = "../banks-interface", version = "=1.10.35" } solana-client = { path = "../client", version = "=1.10.35" } solana-runtime = { path = "../runtime", version = "=1.10.35" } @@ -20,6 +21,15 @@ 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"] } +======= +solana-banks-interface = { path = "../banks-interface", version = "=1.11.6" } +solana-client = { path = "../client", version = "=1.11.6" } +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", features = ["full"] } +>>>>>>> 66919e5ad (Unpin tokio for non-rpc crates (#26957)) tokio-serde = { version = "0.8", features = ["bincode"] } tokio-stream = "0.1" diff --git a/client/Cargo.toml b/client/Cargo.toml index 880dcab4e4135b..b8c0c3f5edbbe1 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -52,8 +52,13 @@ 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" +<<<<<<< HEAD tokio = { version = "~1.14.1", features = ["full"] } tokio-stream = "0.1.8" +======= +tokio = { version = "1", features = ["full"] } +tokio-stream = "0.1.9" +>>>>>>> 66919e5ad (Unpin tokio for non-rpc crates (#26957)) tokio-tungstenite = { version = "0.17.1", features = ["rustls-tls-webpki-roots"] } tungstenite = { version = "0.17.2", features = ["rustls-tls-webpki-roots"] } url = "2.2.2" diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml index cf624f7fad471a..75ae4928b9cbda 100644 --- 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 index 81be50eac43b8e..017b57b84a2c50 100644 --- a/ledger-tool/Cargo.toml +++ b/ledger-tool/Cargo.toml @@ -20,6 +20,7 @@ itertools = "0.10.3" log = { version = "0.4.14" } regex = "1" serde = { version = "1.0", features = ["derive"] } +<<<<<<< HEAD serde_json = "1.0.79" solana-clap-utils = { path = "../clap-utils", version = "=1.10.35" } solana-cli-output = { path = "../cli-output", version = "=1.10.35" } @@ -36,6 +37,24 @@ solana-transaction-status = { path = "../transaction-status", version = "=1.10.3 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"] } +======= +serde_json = "1.0.81" +solana-clap-utils = { path = "../clap-utils", version = "=1.11.6" } +solana-cli-output = { path = "../cli-output", version = "=1.11.6" } +solana-core = { path = "../core", version = "=1.11.6" } +solana-entry = { path = "../entry", version = "=1.11.6" } +solana-ledger = { path = "../ledger", version = "=1.11.6" } +solana-logger = { path = "../logger", version = "=1.11.6" } +solana-measure = { path = "../measure", version = "=1.11.6" } +solana-runtime = { path = "../runtime", version = "=1.11.6" } +solana-sdk = { path = "../sdk", version = "=1.11.6" } +solana-stake-program = { path = "../programs/stake", version = "=1.11.6" } +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", features = ["full"] } +>>>>>>> 66919e5ad (Unpin tokio for non-rpc crates (#26957)) [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 7e88da90f3f3d8..7da3c80f4db9d4 100644 --- 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 index 389fb5d096b7c8..d87df48d0cdd26 100644 --- a/net-utils/Cargo.toml +++ b/net-utils/Cargo.toml @@ -19,10 +19,17 @@ rand = "0.7.0" serde = "1.0.136" serde_derive = "1.0.103" socket2 = "0.4.4" +<<<<<<< HEAD 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"] } +======= +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", features = ["full"] } +>>>>>>> 66919e5ad (Unpin tokio for non-rpc crates (#26957)) url = "2.2.2" [lib] diff --git a/program-test/Cargo.toml b/program-test/Cargo.toml index 72a15f0662809b..fafad26118aef3 100644 --- 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 index 4146ad7ebba40f..2960d08bfdd985 100644 --- a/storage-bigtable/Cargo.toml +++ b/storage-bigtable/Cargo.toml @@ -32,9 +32,15 @@ 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" +<<<<<<< HEAD tokio = "~1.14.1" tonic = { version = "0.7.1", features = ["tls", "transport"] } zstd = "0.11.1" +======= +tokio = "1" +tonic = { version = "0.8.0", features = ["tls", "transport"] } +zstd = "0.11.2" +>>>>>>> 66919e5ad (Unpin tokio for non-rpc crates (#26957)) # openssl is a dependency of the goauth and smpl_jwt crates, but explicitly # declare it here as well to activate the "vendored" feature that builds OpenSSL diff --git a/streamer/Cargo.toml b/streamer/Cargo.toml index 375a755b241a38..5b7a29690e7e00 100644 --- 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 index 040ca97bc4dc22..39aa55f8dfa758 100644 --- a/test-validator/Cargo.toml +++ b/test-validator/Cargo.toml @@ -14,6 +14,7 @@ edition = "2021" base64 = "0.13.0" log = "0.4.14" serde_derive = "1.0.103" +<<<<<<< HEAD serde_json = "1.0.79" solana-cli-output = { path = "../cli-output", version = "=1.10.35" } solana-client = { path = "../client", version = "=1.10.35" } @@ -28,6 +29,23 @@ 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"] } +======= +serde_json = "1.0.81" +solana-cli-output = { path = "../cli-output", version = "=1.11.6" } +solana-client = { path = "../client", version = "=1.11.6" } +solana-core = { path = "../core", version = "=1.11.6" } +solana-gossip = { path = "../gossip", version = "=1.11.6" } +solana-ledger = { path = "../ledger", version = "=1.11.6" } +solana-logger = { path = "../logger", version = "=1.11.6" } +solana-net-utils = { path = "../net-utils", version = "=1.11.6" } +solana-program-runtime = { path = "../program-runtime", version = "=1.11.6" } +solana-program-test = { path = "../program-test", version = "=1.11.6" } +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", features = ["full"] } +>>>>>>> 66919e5ad (Unpin tokio for non-rpc crates (#26957)) [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"]