Skip to content

Commit

Permalink
Unpin tokio for non-rpc crates (#26957)
Browse files Browse the repository at this point in the history 
(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
  • Loading branch information
@mergify
Tyera Eulberg authored and mergify[bot] committed Aug 6, 2022
1 parent 41ee5d6 commit dbda76c
Show file tree
Hide file tree
Showing 10 changed files with 69 additions and 4 deletions.
10 changes: 10 additions & 0 deletions banks-server/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,23 @@ 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" }
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"

Expand Down
5 changes: 5 additions & 0 deletions client/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion faucet/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
19 changes: 19 additions & 0 deletions ledger-tool/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion ledger/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
7 changes: 7 additions & 0 deletions net-utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion program-test/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 6 additions & 0 deletions storage-bigtable/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion streamer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
18 changes: 18 additions & 0 deletions test-validator/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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"]

0 comments on commit dbda76c

Please sign in to comment.