diff --git a/Cargo.lock b/Cargo.lock index 30d3335829b1..1502b4b929f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2603,7 +2603,7 @@ dependencies = [ "indexmap", "log", "slab", - "tokio 0.2.21", + "tokio 0.2.24", "tokio-util", ] @@ -2864,7 +2864,7 @@ dependencies = [ "itoa", "pin-project 1.0.7", "socket2 0.3.17", - "tokio 0.2.21", + "tokio 0.2.24", "tower-service", "tracing", "want 0.3.0", @@ -2905,7 +2905,7 @@ dependencies = [ "log", "rustls 0.18.0", "rustls-native-certs 0.4.0", - "tokio 0.2.21", + "tokio 0.2.24", "tokio-rustls 0.14.0", "webpki", ] @@ -3320,7 +3320,7 @@ dependencies = [ "serde_json", "soketto 0.6.0", "thiserror", - "tokio 0.2.21", + "tokio 0.2.24", "tokio-rustls 0.15.0", "tokio-util", "url 2.2.0", @@ -7296,7 +7296,7 @@ dependencies = [ "substrate-test-client", "substrate-test-utils", "tempfile", - "tokio 0.2.21", + "tokio 1.6.1", "tracing", ] @@ -8354,7 +8354,7 @@ dependencies = [ "structopt", "thiserror", "tiny-bip39", - "tokio 0.2.21", + "tokio 0.2.24", ] [[package]] @@ -10379,7 +10379,7 @@ dependencies = [ "sp-version", "structopt", "thiserror", - "tokio 0.2.21", + "tokio 1.6.1", "westend-runtime", ] @@ -10577,7 +10577,7 @@ dependencies = [ "hyper 0.13.9", "log", "prometheus", - "tokio 0.2.21", + "tokio 0.2.24", ] [[package]] @@ -10616,7 +10616,7 @@ source = "git+https://github.com/paritytech/substrate?branch=master#4d93a6ee4b78 dependencies = [ "futures 0.3.16", "substrate-test-utils-derive", - "tokio 0.2.21", + "tokio 0.2.24", ] [[package]] @@ -10769,7 +10769,7 @@ dependencies = [ "structopt", "substrate-test-utils", "test-parachain-adder", - "tokio 0.2.21", + "tokio 1.6.1", ] [[package]] @@ -10834,7 +10834,7 @@ dependencies = [ "sp-state-machine", "sp-transaction-pool", "sp-wasm-interface", - "tokio 0.2.21", + "tokio 0.2.24", ] [[package]] @@ -10981,9 +10981,9 @@ dependencies = [ [[package]] name = "tokio" -version = "0.2.21" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d099fa27b9702bed751524694adbe393e18b36b204da91eb1cbbbbb4a5ee2d58" +checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48" dependencies = [ "bytes 0.5.6", "fnv", @@ -10998,7 +10998,7 @@ dependencies = [ "pin-project-lite 0.1.7", "signal-hook-registry", "slab", - "tokio-macros", + "tokio-macros 0.2.6", "winapi 0.3.9", ] @@ -11010,6 +11010,7 @@ checksum = "0a38d31d7831c6ed7aad00aa4c12d9375fd225a6dd77da1d25b707346319a975" dependencies = [ "autocfg", "pin-project-lite 0.2.4", + "tokio-macros 1.3.0", ] [[package]] @@ -11078,9 +11079,20 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "0.2.5" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-macros" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" +checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110" dependencies = [ "proc-macro2", "quote", @@ -11127,7 +11139,7 @@ checksum = "228139ddd4fea3fa345a29233009635235833e52807af7ea6448ead03890d6a9" dependencies = [ "futures-core", "rustls 0.18.0", - "tokio 0.2.21", + "tokio 0.2.24", "webpki", ] @@ -11139,7 +11151,7 @@ checksum = "03d15e5669243a45f630a5167d101b942174ca94b615445b2057eace1c818736" dependencies = [ "futures-core", "rustls 0.19.1", - "tokio 0.2.21", + "tokio 0.2.24", "webpki", ] @@ -11250,7 +11262,7 @@ dependencies = [ "futures-sink", "log", "pin-project-lite 0.1.7", - "tokio 0.2.21", + "tokio 0.2.24", ] [[package]] diff --git a/node/test/service/Cargo.toml b/node/test/service/Cargo.toml index 444e36f22a13..a788baf29993 100644 --- a/node/test/service/Cargo.toml +++ b/node/test/service/Cargo.toml @@ -59,4 +59,4 @@ 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.61" substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } -tokio = { version = "0.2", features = ["macros"] } +tokio = { version = "1.6", features = ["macros"] } diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml index 1d1605df9f39..b37c15000576 100644 --- a/parachain/test-parachains/adder/collator/Cargo.toml +++ b/parachain/test-parachains/adder/collator/Cargo.toml @@ -45,4 +45,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 = "0.2", features = ["macros"] } +tokio = { version = "1.6", features = ["macros"] } diff --git a/utils/staking-miner/Cargo.toml b/utils/staking-miner/Cargo.toml index 33cd5c2f9c5c..b70c74702e6f 100644 --- a/utils/staking-miner/Cargo.toml +++ b/utils/staking-miner/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0" } -tokio = { version = "0.2", features = ["macros"] } +tokio = { version = "1.6", features = ["macros"] } log = "0.4.11" env_logger = "0.8.3" structopt = "0.3.0"