From e3e6855490dc1990447626a4260578a887061cc2 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Sat, 28 Aug 2021 16:33:56 +0200
Subject: [PATCH] Bump Tokio to 1.10 (#592)
* Bump Tokio to 1.10
* Missed one
---
cumulus/Cargo.lock | 60 +++++++---------------
cumulus/client/consensus/common/Cargo.toml | 2 +-
cumulus/client/network/Cargo.toml | 2 +-
cumulus/client/pov-recovery/Cargo.toml | 2 +-
cumulus/polkadot-parachains/Cargo.toml | 2 +-
cumulus/test/service/Cargo.toml | 2 +-
6 files changed, 24 insertions(+), 46 deletions(-)
diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock
index 1a635d0997e..fbbba52859e 100644
--- a/cumulus/Cargo.lock
+++ b/cumulus/Cargo.lock
@@ -1508,7 +1508,7 @@ dependencies = [
"sp-trie",
"substrate-prometheus-endpoint",
"substrate-test-utils",
- "tokio 0.2.24",
+ "tokio",
"tracing",
]
@@ -1564,7 +1564,7 @@ dependencies = [
"sp-keystore",
"sp-runtime",
"substrate-test-utils",
- "tokio 0.2.24",
+ "tokio",
"tracing",
]
@@ -1595,7 +1595,7 @@ dependencies = [
"sp-maybe-compressed-blob",
"sp-runtime",
"substrate-test-utils",
- "tokio 0.2.24",
+ "tokio",
"tracing",
]
@@ -2020,7 +2020,7 @@ dependencies = [
"sp-version",
"substrate-test-client",
"substrate-test-utils",
- "tokio 0.2.24",
+ "tokio",
]
[[package]]
@@ -3250,7 +3250,7 @@ dependencies = [
"itoa",
"pin-project-lite 0.2.4",
"socket2 0.4.0",
- "tokio 1.10.0",
+ "tokio",
"tower-service",
"tracing",
"want",
@@ -3268,7 +3268,7 @@ dependencies = [
"log",
"rustls",
"rustls-native-certs",
- "tokio 1.10.0",
+ "tokio",
"tokio-rustls",
"webpki",
]
@@ -3623,7 +3623,7 @@ dependencies = [
"jsonrpc-core",
"lazy_static",
"log",
- "tokio 1.10.0",
+ "tokio",
"tokio-stream",
"tokio-util",
"unicase",
@@ -3694,7 +3694,7 @@ dependencies = [
"serde_json",
"soketto 0.6.0",
"thiserror",
- "tokio 1.10.0",
+ "tokio",
"tokio-rustls",
"tokio-util",
"url 2.2.0",
@@ -6032,7 +6032,7 @@ dependencies = [
"libc",
"log",
"rand 0.7.3",
- "tokio 1.10.0",
+ "tokio",
"winapi 0.3.9",
]
@@ -6552,7 +6552,7 @@ dependencies = [
"substrate-frame-rpc-system",
"substrate-prometheus-endpoint",
"tempfile",
- "tokio 0.2.24",
+ "tokio",
"trie-root 0.15.2",
"westmint-runtime",
]
@@ -8881,7 +8881,7 @@ dependencies = [
"structopt",
"thiserror",
"tiny-bip39",
- "tokio 1.10.0",
+ "tokio",
]
[[package]]
@@ -11139,7 +11139,7 @@ dependencies = [
"hyper",
"log",
"prometheus",
- "tokio 1.10.0",
+ "tokio",
]
[[package]]
@@ -11176,7 +11176,7 @@ source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0
dependencies = [
"futures 0.3.16",
"substrate-test-utils-derive",
- "tokio 1.10.0",
+ "tokio",
]
[[package]]
@@ -11412,20 +11412,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
-version = "0.2.24"
+version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48"
-dependencies = [
- "bytes 0.5.6",
- "pin-project-lite 0.1.11",
- "tokio-macros 0.2.6",
-]
-
-[[package]]
-name = "tokio"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b"
+checksum = "92036be488bb6594459f2e03b60e42df6f937fe6ca5c5ffdcb539c6b84dc40f5"
dependencies = [
"autocfg 1.0.1",
"bytes 1.0.1",
@@ -11436,21 +11425,10 @@ dependencies = [
"once_cell",
"pin-project-lite 0.2.4",
"signal-hook-registry",
- "tokio-macros 1.3.0",
+ "tokio-macros",
"winapi 0.3.9",
]
-[[package]]
-name = "tokio-macros"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
-dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
-]
-
[[package]]
name = "tokio-macros"
version = "1.3.0"
@@ -11469,7 +11447,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
dependencies = [
"rustls",
- "tokio 1.10.0",
+ "tokio",
"webpki",
]
@@ -11481,7 +11459,7 @@ checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f"
dependencies = [
"futures-core",
"pin-project-lite 0.2.4",
- "tokio 1.10.0",
+ "tokio",
]
[[package]]
@@ -11496,7 +11474,7 @@ dependencies = [
"futures-sink",
"log",
"pin-project-lite 0.2.4",
- "tokio 1.10.0",
+ "tokio",
]
[[package]]
diff --git a/cumulus/client/consensus/common/Cargo.toml b/cumulus/client/consensus/common/Cargo.toml
index 9253dd60ae5..f7f4565ba64 100644
--- a/cumulus/client/consensus/common/Cargo.toml
+++ b/cumulus/client/consensus/common/Cargo.toml
@@ -47,5 +47,5 @@ cumulus-primitives-core = { path = "../../../primitives/core" }
polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
# Other deps
-tokio = { version = "0.2.21", features = ["macros"] }
+tokio = { version = "1.10", features = ["macros"] }
futures-timer = "3.0.2"
diff --git a/cumulus/client/network/Cargo.toml b/cumulus/client/network/Cargo.toml
index a63d9a90e5f..d8d9bb2a6c8 100644
--- a/cumulus/client/network/Cargo.toml
+++ b/cumulus/client/network/Cargo.toml
@@ -30,7 +30,7 @@ parking_lot = "0.10.2"
derive_more = "0.99.2"
[dev-dependencies]
-tokio = { version = "0.2.21", features = ["macros"] }
+tokio = { version = "1.10", features = ["macros"] }
# Cumulus deps
cumulus-test-service = { path = "../../test/service" }
diff --git a/cumulus/client/pov-recovery/Cargo.toml b/cumulus/client/pov-recovery/Cargo.toml
index d400af7907e..bc4d506b5fa 100644
--- a/cumulus/client/pov-recovery/Cargo.toml
+++ b/cumulus/client/pov-recovery/Cargo.toml
@@ -32,7 +32,7 @@ tracing = "0.1.22"
rand = "0.8.3"
[dev-dependencies]
-tokio = { version = "0.2.21", features = ["macros"] }
+tokio = { version = "1.10", features = ["macros"] }
# Cumulus deps
cumulus-test-service = { path = "../../test/service" }
diff --git a/cumulus/polkadot-parachains/Cargo.toml b/cumulus/polkadot-parachains/Cargo.toml
index 1fc37782281..25667e89c1a 100644
--- a/cumulus/polkadot-parachains/Cargo.toml
+++ b/cumulus/polkadot-parachains/Cargo.toml
@@ -93,7 +93,7 @@ assert_cmd = "0.12"
nix = "0.17"
rand = "0.7.3"
tempfile = "3.2.0"
-tokio = { version = "0.2.13", features = ["macros"] }
+tokio = { version = "1.10", features = ["macros"] }
[features]
default = []
diff --git a/cumulus/test/service/Cargo.toml b/cumulus/test/service/Cargo.toml
index 29e1be80f44..1b14bce61d5 100644
--- a/cumulus/test/service/Cargo.toml
+++ b/cumulus/test/service/Cargo.toml
@@ -61,7 +61,7 @@ jsonrpc-core = "18.0.0"
[dev-dependencies]
futures = "0.3.5"
-tokio = { version = "0.2.21", features = ["macros"] }
+tokio = { version = "1.10", features = ["macros"] }
# Polkadot dependencies
polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "master" }
--
GitLab