gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust tokio version to just "1"

Browse Source 
(cherry picked from commit 43feef7362)

# Conflicts:
#	faucet/Cargo.toml
#	net-utils/Cargo.toml
This commit is contained in:
Michael Vines
2021-04-05 08:55:57 -07:00
parent 6184254416
commit 270749185c
9 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
banks-client/Cargo.toml
View File

@ -19,7 +19,7 @@ solana-banks-interface = { path = "../banks-interface", version = "=1.6.5" }
solana-program = { path = "../sdk/program", version = "=1.6.5" } solana-program = { path = "../sdk/program", version = "=1.6.5" }
solana-sdk = { path = "../sdk", version = "=1.6.5" } solana-sdk = { path = "../sdk", version = "=1.6.5" }
tarpc = { version = "0.24.1", features = ["full"] } tarpc = { version = "0.24.1", features = ["full"] }
tokio = { version = "1.1", features = ["full"] } tokio = { version = "1", features = ["full"] }
tokio-serde = { version = "0.8", features = ["bincode"] } tokio-serde = { version = "0.8", features = ["bincode"] }
[dev-dependencies] [dev-dependencies]

2
banks-interface/Cargo.toml
View File

@ -16,7 +16,7 @@ solana-sdk = { path = "../sdk", version = "=1.6.5" }
tarpc = { version = "0.24.1", features = ["full"] } tarpc = { version = "0.24.1", features = ["full"] }
[dev-dependencies] [dev-dependencies]
tokio = { version = "1.1", features = ["full"] } tokio = { version = "1", features = ["full"] }
[lib] [lib]
crate-type = ["lib"] crate-type = ["lib"]

2
banks-server/Cargo.toml
View File

@ -19,7 +19,7 @@ solana-runtime = { path = "../runtime", version = "=1.6.5" }
solana-sdk = { path = "../sdk", version = "=1.6.5" } solana-sdk = { path = "../sdk", version = "=1.6.5" }
solana-metrics = { path = "../metrics", version = "=1.6.5" } solana-metrics = { path = "../metrics", version = "=1.6.5" }
tarpc = { version = "0.24.1", features = ["full"] } tarpc = { version = "0.24.1", features = ["full"] }
tokio = { version = "1.1", features = ["full"] } tokio = { version = "1", features = ["full"] }
tokio-serde = { version = "0.8", features = ["bincode"] } tokio-serde = { version = "0.8", features = ["bincode"] }
tokio-stream = "0.1" tokio-stream = "0.1"

2
core/Cargo.toml
View File

@ -79,7 +79,7 @@ solana-vote-program = { path = "../programs/vote", version = "=1.6.5" }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] } spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
tempfile = "3.1.0" tempfile = "3.1.0"
thiserror = "1.0" thiserror = "1.0"
tokio = { version = "1.1", features = ["full"] } tokio = { version = "1", features = ["full"] }
tokio_02 = { version = "0.2", package = "tokio", features = ["full"] } tokio_02 = { version = "0.2", package = "tokio", features = ["full"] }
tokio-util = { version = "0.3", features = ["codec"] } # This crate needs to stay in sync with tokio_02, until that dependency can be removed tokio-util = { version = "0.3", features = ["codec"] } # This crate needs to stay in sync with tokio_02, until that dependency can be removed
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.6.5" } solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.6.5" }

10
faucet/Cargo.toml
View File

@ -16,6 +16,7 @@ clap = "2.33"
log = "0.4.11" log = "0.4.11"
serde = "1.0.122" serde = "1.0.122"
serde_derive = "1.0.103" serde_derive = "1.0.103"
<<<<<<< HEAD
solana-clap-utils = { path = "../clap-utils", version = "=1.6.5" } solana-clap-utils = { path = "../clap-utils", version = "=1.6.5" }
solana-cli-config = { path = "../cli-config", version = "=1.6.5" } solana-cli-config = { path = "../cli-config", version = "=1.6.5" }
solana-logger = { path = "../logger", version = "=1.6.5" } solana-logger = { path = "../logger", version = "=1.6.5" }
@ -23,6 +24,15 @@ solana-metrics = { path = "../metrics", version = "=1.6.5" }
solana-sdk = { path = "../sdk", version = "=1.6.5" } solana-sdk = { path = "../sdk", version = "=1.6.5" }
solana-version = { path = "../version", version = "=1.6.5" } solana-version = { path = "../version", version = "=1.6.5" }
tokio = { version = "1.1", features = ["full"] } tokio = { version = "1.1", features = ["full"] }
=======
solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
solana-cli-config = { path = "../cli-config", version = "=1.7.0" }
solana-logger = { path = "../logger", version = "=1.7.0" }
solana-metrics = { path = "../metrics", version = "=1.7.0" }
solana-sdk = { path = "../sdk", version = "=1.7.0" }
solana-version = { path = "../version", version = "=1.7.0" }
tokio = { version = "1", features = ["full"] }
>>>>>>> 43feef736... Adjust tokio version to just "1"
[lib] [lib]
crate-type = ["lib"] crate-type = ["lib"]

2
ledger-tool/Cargo.toml
View File

@ -36,7 +36,7 @@ solana-transaction-status = { path = "../transaction-status", version = "=1.6.5"
solana-version = { path = "../version", version = "=1.6.5" } solana-version = { path = "../version", version = "=1.6.5" }
solana-vote-program = { path = "../programs/vote", version = "=1.6.5" } solana-vote-program = { path = "../programs/vote", version = "=1.6.5" }
tempfile = "3.1.0" tempfile = "3.1.0"
tokio = { version = "1.1", features = ["full"] } tokio = { version = "1", features = ["full"] }
[dev-dependencies] [dev-dependencies]
assert_cmd = "1.0" assert_cmd = "1.0"

2
ledger/Cargo.toml
View File

@ -52,7 +52,7 @@ solana-storage-proto = { path = "../storage-proto", version = "=1.6.5" }
solana-vote-program = { path = "../programs/vote", version = "=1.6.5" } solana-vote-program = { path = "../programs/vote", version = "=1.6.5" }
tempfile = "3.1.0" tempfile = "3.1.0"
thiserror = "1.0" thiserror = "1.0"
tokio = { version = "1.1", features = ["full"] } tokio = { version = "1", features = ["full"] }
tokio-stream = "0.1" tokio-stream = "0.1"
trees = "0.2.1" trees = "0.2.1"

7
net-utils/Cargo.toml
View File

@ -18,10 +18,17 @@ rand = "0.7.0"
serde = "1.0.122" serde = "1.0.122"
serde_derive = "1.0.103" serde_derive = "1.0.103"
socket2 = "0.3.17" socket2 = "0.3.17"
<<<<<<< HEAD
solana-clap-utils = { path = "../clap-utils", version = "=1.6.5" } solana-clap-utils = { path = "../clap-utils", version = "=1.6.5" }
solana-logger = { path = "../logger", version = "=1.6.5" } solana-logger = { path = "../logger", version = "=1.6.5" }
solana-version = { path = "../version", version = "=1.6.5" } solana-version = { path = "../version", version = "=1.6.5" }
tokio = { version = "1.1", features = ["full"] } tokio = { version = "1.1", features = ["full"] }
=======
solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
solana-logger = { path = "../logger", version = "=1.7.0" }
solana-version = { path = "../version", version = "=1.7.0" }
tokio = { version = "1", features = ["full"] }
>>>>>>> 43feef736... Adjust tokio version to just "1"
url = "2.1.1" url = "2.1.1"
[lib] [lib]

2
program-test/Cargo.toml
View File

@ -22,7 +22,7 @@ solana-runtime = { path = "../runtime", version = "=1.6.5" }
solana-sdk = { path = "../sdk", version = "=1.6.5" } solana-sdk = { path = "../sdk", version = "=1.6.5" }
solana-vote-program = { path = "../programs/vote", version = "=1.6.5" } solana-vote-program = { path = "../programs/vote", version = "=1.6.5" }
thiserror = "1.0" thiserror = "1.0"
tokio = { version = "1.1", features = ["full"] } tokio = { version = "1", features = ["full"] }
[dev-dependencies] [dev-dependencies]
solana-stake-program = { path = "../programs/stake", version = "=1.6.5" } solana-stake-program = { path = "../programs/stake", version = "=1.6.5" }