Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump tokio from 1.1.0 to 1.3.0 #2115

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/faucet/Cargo.toml
Expand Up @@ -16,7 +16,7 @@ reqwest = { version = "0.11.0", features = ["blocking"], default-features = fals
serde = "1.0.123"
serde_derive = "1.0.117"
structopt = "0.3.21"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
warp = "0.3.0"

generate-key = { path = "../../config/generate-key", version = "0.1.0" }
Expand Down
2 changes: 1 addition & 1 deletion client/json-rpc/Cargo.toml
Expand Up @@ -18,7 +18,7 @@ rand = "0.7.3"
reqwest = { version = "0.11.0", features = ["blocking", "json"], default_features = false }
serde = { version = "1.0.123", default-features = false }
serde_json = "1.0.61"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }

diem-crypto = { path = "../../crypto/crypto", version = "0.1.0" }
bcs = "0.1.2"
Expand Down
4 changes: 2 additions & 2 deletions common/bounded-executor/Cargo.toml
Expand Up @@ -12,7 +12,7 @@ edition = "2018"
[dependencies]
futures = "0.3.12"
diem-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }
tokio = { version = "1.1.0", features = ["sync"] }
tokio = { version = "1.3.0", features = ["sync"] }

[dev-dependencies]
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
2 changes: 1 addition & 1 deletion common/channel/Cargo.toml
Expand Up @@ -18,4 +18,4 @@ diem-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }

[dev-dependencies]
diem-types = { path = "../../types", version = "0.1.0" }
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
2 changes: 1 addition & 1 deletion common/debug-interface/Cargo.toml
Expand Up @@ -12,7 +12,7 @@ edition = "2018"
[dependencies]
anyhow = "1.0.38"
bytes = "1.0.1"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
reqwest = { version = "0.11.0", features = ["blocking", "json"], default_features = false }
warp = "0.3.0"

Expand Down
2 changes: 1 addition & 1 deletion common/metrics/Cargo.toml
Expand Up @@ -16,7 +16,7 @@ hyper = { version = "0.14.2", features = ["full"] }
once_cell = "1.4.1"
prometheus = { version = "0.11.0", default-features = false }
serde_json = "1.0.61"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }

diem-logger = { path = "../logger", version = "0.1.0" }
diem-metrics-core = { path = "../metrics-core", version = "0.1.0" }
Expand Down
2 changes: 1 addition & 1 deletion common/rate-limiter/Cargo.toml
Expand Up @@ -16,5 +16,5 @@ diem-logger = { path = "../logger", version = "0.1.0" }
diem-metrics = { path = "../metrics", version = "0.1.0" }
futures = "0.3.12"
pin-project = "1.0.4"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
tokio-util = { version = "0.6.2", features = ["compat"] }
2 changes: 1 addition & 1 deletion common/retrier/Cargo.toml
Expand Up @@ -11,5 +11,5 @@ edition = "2018"

[dependencies]
diem-workspace-hack = { path = "..//workspace-hack", version = "0.1.0" }
tokio = { version = "1.1.0", features = ["time"] }
tokio = { version = "1.3.0", features = ["time"] }
diem-logger = { path = "../../common/logger", version = "0.1.0"}
4 changes: 2 additions & 2 deletions common/time-service/Cargo.toml
Expand Up @@ -14,15 +14,15 @@ enum_dispatch = "0.3.5"
futures = { version = "0.3.12", optional = true }
pin-project = { version = "1.0.4", optional = true }
thiserror = "1.0.23"
tokio = { version = "1.1.0", features = ["macros", "rt-multi-thread", "time"], optional = true }
tokio = { version = "1.3.0", features = ["macros", "rt-multi-thread", "time"], optional = true }

diem-infallible = { path = "../infallible", version = "0.1.0" }
diem-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }

[dev-dependencies]
futures = "0.3.12"
pin-project = "1.0.4"
tokio = { version = "1.1.0", features = ["macros", "rt-multi-thread", "time"] }
tokio = { version = "1.3.0", features = ["macros", "rt-multi-thread", "time"] }
tokio-test = "0.4.0"

[features]
Expand Down
2 changes: 1 addition & 1 deletion common/trace/Cargo.toml
Expand Up @@ -12,7 +12,7 @@ edition = "2018"
[dependencies]
chrono = "0.4.19"
structopt = "0.3.21"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
serde_json = "1.0.61"
serde = "1.0.123"
anyhow = "1.0.38"
Expand Down
2 changes: 1 addition & 1 deletion consensus/Cargo.toml
Expand Up @@ -27,7 +27,7 @@ serde = { version = "1.0.123", default-features = false }
serde_json = "1.0.61"
termion = { version = "1.5.6", default-features = false }
thiserror = "1.0.23"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }

channel = { path = "../common/channel", version = "0.1.0" }
consensus-types = { path = "consensus-types", version = "0.1.0", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion diem-node/Cargo.toml
Expand Up @@ -14,7 +14,7 @@ fail = "0.4.0"
futures = "0.3.12"
jemallocator = { version = "0.3.2", features = ["profiling", "unprefixed_malloc_on_supported_platforms"] }
structopt = "0.3.21"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
tokio-stream = "0.1.2"

backup-service = { path = "../storage/backup/backup-service", version = "0.1.0" }
Expand Down
2 changes: 1 addition & 1 deletion json-rpc/Cargo.toml
Expand Up @@ -19,7 +19,7 @@ once_cell = "1.4.1"
rand = "0.7.3"
serde_json = "1.0.61"
serde = { version = "1.0.123", default-features = false }
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
warp = { version = "0.3.0", features = ["tls"] }
reqwest = { version = "0.11.0", features = ["blocking", "json"], default_features = false, optional = true }
proptest = { version = "0.10.1", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion language/diem-tools/diem-events-fetcher/Cargo.toml
Expand Up @@ -17,7 +17,7 @@ hex = "0.4.2"
reqwest = { version = "0.11.0", features = ["blocking", "json"] }
structopt = "0.3.21"
futures = "0.3.12"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }

diem-workspace-hack = { path = "../../../common/workspace-hack", version = "0.1.0" }
diem-json-rpc-client = { path = "../../../client/json-rpc", version = "0.1.0" }
Expand Down
2 changes: 1 addition & 1 deletion language/move-prover/Cargo.toml
Expand Up @@ -41,7 +41,7 @@ serde = { version = "1.0.123", features = ["derive"] }
serde_json = "1.0.61"
simplelog = "0.9.0"
once_cell = "1.4.1"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
toml = "0.5.8"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion mempool/Cargo.toml
Expand Up @@ -18,7 +18,7 @@ once_cell = "1.4.1"
proptest = { version = "0.10.1", optional = true }
rayon = "1.4.1"
serde = { version = "1.0.123", default-features = false }
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
tokio-stream = "0.1.2"

bounded-executor = { path = "../common/bounded-executor", version = "0.1.0" }
Expand Down
2 changes: 1 addition & 1 deletion network/Cargo.toml
Expand Up @@ -24,7 +24,7 @@ rand_core = { version = "0.5.1", optional = true }
serde = { version = "1.0.123", default-features = false }
serde_bytes = "0.11.5"
thiserror = "1.0.23"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
tokio-retry = "0.2.0"
tokio-stream = "0.1.2"
tokio-util = { version = "0.6.2", features = ["compat", "codec"] }
Expand Down
2 changes: 1 addition & 1 deletion network/builder/Cargo.toml
Expand Up @@ -15,7 +15,7 @@ edition = "2018"
futures = "0.3.12"
rand = "0.7.3"
serde = { version = "1.0.123", default-features = false }
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }

channel = { path = "../../common/channel", version = "0.1.0" }
bcs = "0.1.2"
Expand Down
2 changes: 1 addition & 1 deletion network/netcore/Cargo.toml
Expand Up @@ -14,7 +14,7 @@ bytes = "1.0.1"
futures = "0.3.12"
pin-project = "1.0.4"
serde = { version = "1.0.123", default-features = false }
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
tokio-util = { version = "0.6.2", features = ["compat"] }
url = { version = "2.1.1" }

Expand Down
2 changes: 1 addition & 1 deletion network/simple-onchain-discovery/Cargo.toml
Expand Up @@ -13,7 +13,7 @@ edition = "2018"
anyhow = "1.0.38"
futures = "0.3.12"
once_cell = "1.4.1"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }

channel = {path = "../../common/channel", version = "0.1.0"}
bcs = "0.1.2"
Expand Down
2 changes: 1 addition & 1 deletion network/socket-bench-server/Cargo.toml
Expand Up @@ -11,7 +11,7 @@ edition = "2018"

[dependencies]
futures = "0.3.12"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
tokio-util = { version = "0.6.2", features = ["compat", "codec"] }

diem-crypto = { path = "../../crypto/crypto" }
Expand Down
2 changes: 1 addition & 1 deletion secure/json-rpc/Cargo.toml
Expand Up @@ -28,7 +28,7 @@ proxy = { path = "../../common/proxy" }
anyhow = "1.0.38"
futures = "0.3.12"
proptest = "0.10.1"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }

diem-config = { path = "../../config", version = "0.1.0" }
diem-proptest-helpers = { path = "../../common/proptest-helpers", version = "0.1.0"}
Expand Down
2 changes: 1 addition & 1 deletion secure/key-manager/Cargo.toml
Expand Up @@ -32,7 +32,7 @@ transaction-builder-generated = { path = "../../client/transaction-builder", ver
anyhow = "1.0.38"
futures = "0.3.12"
rand = "0.7.3"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }

executor = { path = "../../execution/executor", version = "0.1.0" }
executor-test-helpers = { path = "../../execution/executor-test-helpers", version = "0.1.0" }
Expand Down
2 changes: 1 addition & 1 deletion state-sync/Cargo.toml
Expand Up @@ -19,7 +19,7 @@ once_cell = "1.4.1"
proptest = { version = "0.10.1", optional = true }
rand = "0.7.3"
serde = { version = "1.0.123", default-features = false }
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
tokio-stream = "0.1.2"

channel = { path = "../common/channel", version = "0.1.0" }
Expand Down
2 changes: 1 addition & 1 deletion storage/backup/backup-cli/Cargo.toml
Expand Up @@ -26,7 +26,7 @@ serde = { version = "1.0.123", features = ["derive"] }
serde_json = "1.0.61"
structopt = "0.3.21"
toml = "0.5.8"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
tokio-stream = "0.1.2"
tokio-util = { version = "0.6.2", features = ["compat"] }

Expand Down
2 changes: 1 addition & 1 deletion storage/backup/backup-service/Cargo.toml
Expand Up @@ -15,7 +15,7 @@ futures = "0.3.12"
hyper = "0.14.2"
once_cell = "1.4.1"
serde = { version = "1.0.123", default-features = false }
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
warp = "0.3.0"

bcs = "0.1.2"
Expand Down
2 changes: 1 addition & 1 deletion storage/storage-service/Cargo.toml
Expand Up @@ -11,7 +11,7 @@ edition = "2018"

[dependencies]
anyhow = "1.0.38"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
futures = "0.3.12"

bcs = "0.1.2"
Expand Down
2 changes: 1 addition & 1 deletion testsuite/cli/Cargo.toml
Expand Up @@ -21,7 +21,7 @@ once_cell = "1.4.1"
reqwest = { version = "0.11.0", features = ["blocking", "json"] }
serde = { version = "1.0.123", features = ["derive"] }
structopt = "0.3.21"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
walkdir = "2.3.1"

diem-config = { path = "../../config", version = "0.1.0" }
Expand Down
2 changes: 1 addition & 1 deletion testsuite/cluster-test/Cargo.toml
Expand Up @@ -62,7 +62,7 @@ state-sync = { path = "../../state-sync", version = "0.1.0" }
transaction-builder = { path = "../../language/transaction-builder", version = "0.1.0" }

futures = "0.3.12"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }
async-trait = "0.1.42"

kube = "0.48.0"
Expand Down
2 changes: 1 addition & 1 deletion testsuite/smoke-test/Cargo.toml
Expand Up @@ -20,7 +20,7 @@ regex = "1.4.3"
rust_decimal = "1.10.1"
rusty-fork = "0.3.0"
statistical = "1.0.0"
tokio = { version = "1.1.0", features = ["full"] }
tokio = { version = "1.3.0", features = ["full"] }

backup-cli = { path = "../../storage/backup/backup-cli", version = "0.1.0" }
cli = { path = "../cli", version = "0.1.0", features = ["fuzzing"] }
Expand Down