Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Upgrade tokio to 1.22.0 #6262

Merged
dmitry-markin merged 9 commits into from
Dec 5, 2022
Merged

Upgrade tokio to 1.22.0 #6262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0047b66
Upgrade tokio to 1.21.2
dmitry-markin Nov 10, 2022
c5b741e
Merge remote-tracking branch 'origin/master' into dm-upgrade-tokio-an…
dmitry-markin Nov 24, 2022
f7f9430
Bump tokio to 1.22.0
dmitry-markin Nov 24, 2022
f6c3848
Merge remote-tracking branch 'origin/master' into dm-upgrade-tokio-an…
dmitry-markin Nov 27, 2022
f35d5b3
Move Jaeger to Tokio
dmitry-markin Nov 27, 2022
add2412
Add support for outbound only configs on request/response protocols (…
skunert Nov 26, 2022
e27abd6
Merge remote-tracking branch 'origin/master' into dm-upgrade-tokio-an…
dmitry-markin Dec 3, 2022
492cabd
Merge remote-tracking branch 'origin/master' into dm-upgrade-tokio-an…
Dec 5, 2022
ecabd95
update lockfile for {"substrate"}
Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
480 changes: 251 additions & 229 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ parity-util-mem = { version = "0.12.0", default-features = false, features = ["j
assert_cmd = "2.0.4"
nix = "0.24.1"
tempfile = "3.2.0"
tokio = "1.19.2"
tokio = "1.22.0"
substrate-rpc-client = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-core-primitives = { path = "core-primitives" }

Expand Down
2 changes: 1 addition & 1 deletion node/jaeger/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ edition = "2021"
description = "Polkadot Jaeger primitives, but equally useful for Grafana/Tempo"

[dependencies]
async-std = "1.11.0"
mick-jaeger = "0.1.8"
lazy_static = "1.4"
parking_lot = "0.12.0"
Expand All @@ -15,5 +14,6 @@ polkadot-node-primitives = { path = "../primitives" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
thiserror = "1.0.31"
tokio = "1.22.0"
log = "0.4.17"
parity-scale-codec = { version = "3.1.5", default-features = false }
2 changes: 1 addition & 1 deletion node/jaeger/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ impl Jaeger {
"jaeger-collector",
Some("jaeger"),
Box::pin(async move {
match async_std::net::UdpSocket::bind("0.0.0.0:0").await {
match tokio::net::UdpSocket::bind("0.0.0.0:0").await {
Ok(udp_socket) => loop {
let buf = traces_out.next().await;
// UDP sending errors happen only either if the API is misused or in case of missing privilege.
Expand Down
2 changes: 1 addition & 1 deletion node/metrics/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ assert_cmd = "2.0.4"
nix = "0.24.1"
tempfile = "3.2.0"
hyper = { version = "0.14.20", default-features = false, features = ["http1", "tcp"] }
tokio = "1.19.2"
tokio = "1.22.0"
polkadot-test-service = { path = "../test/service", features=["runtime-metrics"]}
substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
Expand Down
4 changes: 2 additions & 2 deletions node/test/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ hex = "0.4.3"
gum = { package = "tracing-gum", path = "../../gum" }
rand = "0.8.5"
tempfile = "3.2.0"
tokio = "1.19.2"
tokio = "1.22.0"

# Polkadot dependencies
polkadot-overseer = { path = "../../overseer" }
Expand Down Expand Up @@ -61,7 +61,7 @@ substrate-test-client = { git = "https://github.com/paritytech/substrate", branc
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
serde_json = "1.0.81"
substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
tokio = { version = "1.19.2", features = ["macros"] }
tokio = { version = "1.22.0", features = ["macros"] }

[features]
runtime-metrics=["polkadot-test-runtime/runtime-metrics"]
2 changes: 1 addition & 1 deletion node/zombienet-backchannel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ readme = "README.md"
publish = false

[dependencies]
tokio = { version = "1.19.2", default-features = false, features = ["macros", "net", "rt-multi-thread", "sync"] }
tokio = { version = "1.22.0", default-features = false, features = ["macros", "net", "rt-multi-thread", "sync"] }
url = "2.0.0"
tokio-tungstenite = "0.17"
futures-util = "0.3.23"
Expand Down
2 changes: 1 addition & 1 deletion parachain/test-parachains/adder/collator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }

tokio = { version = "1.19.2", features = ["macros"] }
tokio = { version = "1.22.0", features = ["macros"] }
2 changes: 1 addition & 1 deletion parachain/test-parachains/undying/collator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }

tokio = { version = "1.19", features = ["macros"] }
tokio = { version = "1.22.0", features = ["macros"] }
2 changes: 1 addition & 1 deletion runtime/kusama/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
separator = "0.4.1"
serde_json = "1.0.81"
remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master" }
tokio = { version = "1.19.2", features = ["macros"] }
tokio = { version = "1.22.0", features = ["macros"] }
sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion runtime/polkadot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
serde_json = "1.0.81"
separator = "0.4.1"
remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master" }
tokio = { version = "1.19.2", features = ["macros"] }
tokio = { version = "1.22.0", features = ["macros"] }
sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion runtime/westend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substra
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
serde_json = "1.0.81"
remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master" }
tokio = { version = "1.19.2", features = ["macros"] }
tokio = { version = "1.22.0", features = ["macros"] }
sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion utils/remote-ext-tests/bags-list/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }

clap = { version = "4.0.9", features = ["derive"] }
log = "0.4.17"
tokio = { version = "1.19.2", features = ["macros"] }
tokio = { version = "1.22.0", features = ["macros"] }
2 changes: 1 addition & 1 deletion utils/staking-miner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ paste = "1.0.7"
serde = "1.0.137"
serde_json = "1.0"
thiserror = "1.0.31"
tokio = { version = "1.19.2", features = ["macros", "rt-multi-thread", "sync"] }
tokio = { version = "1.22.0", features = ["macros", "rt-multi-thread", "sync"] }
remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master" }
signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
Expand Down