Skip to content
Snippets Groups Projects
Commit f2f5345a authored by Dmitry Markin's avatar Dmitry Markin Committed by GitHub
Browse files

Upgrade tokio to 1.22.0 (#6262)


Co-authored-by: default avatarSebastian Kunert <skunert49@gmail.com>
parent 8bf11e1d
Branches
No related merge requests found
Showing
with 265 additions and 243 deletions
This diff is collapsed.
...@@ -21,7 +21,7 @@ parity-util-mem = { version = "0.12.0", default-features = false, features = ["j ...@@ -21,7 +21,7 @@ parity-util-mem = { version = "0.12.0", default-features = false, features = ["j
assert_cmd = "2.0.4" assert_cmd = "2.0.4"
nix = "0.24.1" nix = "0.24.1"
tempfile = "3.2.0" tempfile = "3.2.0"
tokio = "1.19.2" tokio = "1.22.0"
substrate-rpc-client = { git = "https://github.com/paritytech/substrate", branch = "master" } substrate-rpc-client = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-core-primitives = { path = "core-primitives" } polkadot-core-primitives = { path = "core-primitives" }
......
...@@ -6,7 +6,6 @@ edition = "2021" ...@@ -6,7 +6,6 @@ edition = "2021"
description = "Polkadot Jaeger primitives, but equally useful for Grafana/Tempo" description = "Polkadot Jaeger primitives, but equally useful for Grafana/Tempo"
[dependencies] [dependencies]
async-std = "1.11.0"
mick-jaeger = "0.1.8" mick-jaeger = "0.1.8"
lazy_static = "1.4" lazy_static = "1.4"
parking_lot = "0.12.0" parking_lot = "0.12.0"
...@@ -15,5 +14,6 @@ polkadot-node-primitives = { path = "../primitives" } ...@@ -15,5 +14,6 @@ polkadot-node-primitives = { path = "../primitives" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
thiserror = "1.0.31" thiserror = "1.0.31"
tokio = "1.22.0"
log = "0.4.17" log = "0.4.17"
parity-scale-codec = { version = "3.1.5", default-features = false } parity-scale-codec = { version = "3.1.5", default-features = false }
...@@ -129,7 +129,7 @@ impl Jaeger { ...@@ -129,7 +129,7 @@ impl Jaeger {
"jaeger-collector", "jaeger-collector",
Some("jaeger"), Some("jaeger"),
Box::pin(async move { 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 { Ok(udp_socket) => loop {
let buf = traces_out.next().await; let buf = traces_out.next().await;
// UDP sending errors happen only either if the API is misused or in case of missing privilege. // UDP sending errors happen only either if the API is misused or in case of missing privilege.
......
...@@ -28,7 +28,7 @@ assert_cmd = "2.0.4" ...@@ -28,7 +28,7 @@ assert_cmd = "2.0.4"
nix = "0.24.1" nix = "0.24.1"
tempfile = "3.2.0" tempfile = "3.2.0"
hyper = { version = "0.14.20", default-features = false, features = ["http1", "tcp"] } 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"]} polkadot-test-service = { path = "../test/service", features=["runtime-metrics"]}
substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
......
...@@ -10,7 +10,7 @@ hex = "0.4.3" ...@@ -10,7 +10,7 @@ hex = "0.4.3"
gum = { package = "tracing-gum", path = "../../gum" } gum = { package = "tracing-gum", path = "../../gum" }
rand = "0.8.5" rand = "0.8.5"
tempfile = "3.2.0" tempfile = "3.2.0"
tokio = "1.19.2" tokio = "1.22.0"
# Polkadot dependencies # Polkadot dependencies
polkadot-overseer = { path = "../../overseer" } polkadot-overseer = { path = "../../overseer" }
...@@ -61,7 +61,7 @@ substrate-test-client = { git = "https://github.com/paritytech/substrate", branc ...@@ -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 } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
serde_json = "1.0.81" serde_json = "1.0.81"
substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } 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] [features]
runtime-metrics=["polkadot-test-runtime/runtime-metrics"] runtime-metrics=["polkadot-test-runtime/runtime-metrics"]
...@@ -9,7 +9,7 @@ readme = "README.md" ...@@ -9,7 +9,7 @@ readme = "README.md"
publish = false publish = false
[dependencies] [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" url = "2.0.0"
tokio-tungstenite = "0.17" tokio-tungstenite = "0.17"
futures-util = "0.3.23" futures-util = "0.3.23"
......
...@@ -44,4 +44,4 @@ substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch ...@@ -44,4 +44,4 @@ substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { 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"] }
...@@ -44,4 +44,4 @@ substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch ...@@ -44,4 +44,4 @@ substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { 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"] }
...@@ -109,7 +109,7 @@ sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } ...@@ -109,7 +109,7 @@ sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
separator = "0.4.1" separator = "0.4.1"
serde_json = "1.0.81" serde_json = "1.0.81"
remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master" } 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 } sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
[build-dependencies] [build-dependencies]
......
...@@ -101,7 +101,7 @@ sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } ...@@ -101,7 +101,7 @@ sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
serde_json = "1.0.81" serde_json = "1.0.81"
separator = "0.4.1" separator = "0.4.1"
remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master" } 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 } sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
[build-dependencies] [build-dependencies]
......
...@@ -101,7 +101,7 @@ keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substra ...@@ -101,7 +101,7 @@ keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substra
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
serde_json = "1.0.81" serde_json = "1.0.81"
remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master" } 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 } sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
[build-dependencies] [build-dependencies]
......
...@@ -19,4 +19,4 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } ...@@ -19,4 +19,4 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
clap = { version = "4.0.9", features = ["derive"] } clap = { version = "4.0.9", features = ["derive"] }
log = "0.4.17" log = "0.4.17"
tokio = { version = "1.19.2", features = ["macros"] } tokio = { version = "1.22.0", features = ["macros"] }
...@@ -14,7 +14,7 @@ paste = "1.0.7" ...@@ -14,7 +14,7 @@ paste = "1.0.7"
serde = "1.0.137" serde = "1.0.137"
serde_json = "1.0" serde_json = "1.0"
thiserror = "1.0.31" 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" } remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master" }
signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] } signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment