From e95647e79078ffc2bf27f1591083eac618747346 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Mar 2021 06:03:30 +0000 Subject: [PATCH] Bump tokio from 0.2.22 to 1.3.0 Bumps [tokio](https://github.com/tokio-rs/tokio) from 0.2.22 to 1.3.0. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-0.2.22...tokio-1.3.0) Signed-off-by: dependabot[bot] --- Cargo.lock | 250 +++++++++++------- client/faucet/Cargo.toml | 2 +- client/json-rpc/Cargo.toml | 2 +- common/bounded-executor/Cargo.toml | 4 +- common/channel/Cargo.toml | 2 +- common/debug-interface/Cargo.toml | 2 +- common/metrics/Cargo.toml | 2 +- common/retrier/Cargo.toml | 2 +- common/trace/Cargo.toml | 2 +- consensus/Cargo.toml | 2 +- diem-node/Cargo.toml | 2 +- json-rpc/Cargo.toml | 2 +- .../diem-tools/diem-events-fetcher/Cargo.toml | 2 +- language/move-prover/Cargo.toml | 2 +- mempool/Cargo.toml | 2 +- network/Cargo.toml | 2 +- network/builder/Cargo.toml | 2 +- network/netcore/Cargo.toml | 2 +- network/simple-onchain-discovery/Cargo.toml | 2 +- network/socket-bench-server/Cargo.toml | 2 +- secure/json-rpc/Cargo.toml | 2 +- secure/key-manager/Cargo.toml | 2 +- state-synchronizer/Cargo.toml | 2 +- storage/backup/backup-cli/Cargo.toml | 2 +- storage/backup/backup-service/Cargo.toml | 2 +- storage/storage-service/Cargo.toml | 2 +- testsuite/cli/Cargo.toml | 2 +- testsuite/cluster-test/Cargo.toml | 2 +- testsuite/smoke-test/Cargo.toml | 2 +- 29 files changed, 183 insertions(+), 125 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ee0de5c7e5c8..d693b2c432ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -178,7 +178,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb1ff21a63d3262af46b9f33a826a8d134e2d0d9b2179c86034948b732ea8b2a" dependencies = [ - "bytes", + "bytes 0.5.6", "flate2", "futures-core", "memchr", @@ -243,7 +243,7 @@ dependencies = [ "backup-service", "bcs", "byteorder", - "bytes", + "bytes 0.5.6", "diem-config", "diem-crypto", "diem-infallible", @@ -273,7 +273,7 @@ dependencies = [ "serde_json", "storage-interface", "structopt 0.3.21", - "tokio", + "tokio 1.3.0", "tokio-util", "toml", ] @@ -284,7 +284,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "diem-config", "diem-crypto", "diem-logger", @@ -299,7 +299,7 @@ dependencies = [ "reqwest", "serde", "storage-interface", - "tokio", + "tokio 1.3.0", "warp", ] @@ -460,7 +460,7 @@ version = "0.1.0" dependencies = [ "diem-workspace-hack", "futures 0.3.8", - "tokio", + "tokio 1.3.0", ] [[package]] @@ -581,6 +581,12 @@ dependencies = [ "serde", ] +[[package]] +name = "bytes" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" + [[package]] name = "c_linked_list" version = "1.1.1" @@ -657,7 +663,7 @@ dependencies = [ "diem-types", "diem-workspace-hack", "futures 0.3.8", - "tokio", + "tokio 1.3.0", ] [[package]] @@ -747,7 +753,7 @@ dependencies = [ "rustyline", "serde", "structopt 0.3.21", - "tokio", + "tokio 1.3.0", "transaction-builder", "walkdir", ] @@ -815,7 +821,7 @@ dependencies = [ "state-synchronizer", "structopt 0.3.21", "termion", - "tokio", + "tokio 1.3.0", "toml", "transaction-builder", ] @@ -906,7 +912,7 @@ dependencies = [ "async-trait", "bcs", "byteorder", - "bytes", + "bytes 0.5.6", "channel", "consensus-types", "diem-config", @@ -945,7 +951,7 @@ dependencies = [ "tempfile", "termion", "thiserror", - "tokio", + "tokio 1.3.0", "vm-genesis", "vm-validator", ] @@ -1276,12 +1282,12 @@ name = "debug-interface" version = "0.1.0" dependencies = [ "anyhow", - "bytes", + "bytes 0.5.6", "diem-logger", "diem-metrics", "diem-workspace-hack", "reqwest", - "tokio", + "tokio 1.3.0", "warp", ] @@ -1356,7 +1362,7 @@ dependencies = [ "bcs", "bitvec", "byteorder", - "bytes", + "bytes 0.5.6", "criterion", "curve25519-dalek 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "curve25519-dalek 3.0.0 (git+https://github.com/novifinancial/curve25519-dalek.git?branch=fiat3)", @@ -1446,7 +1452,7 @@ dependencies = [ "hex", "reqwest", "structopt 0.3.21", - "tokio", + "tokio 1.3.0", ] [[package]] @@ -1471,7 +1477,7 @@ dependencies = [ "serde_json", "structopt 0.3.21", "tempfile", - "tokio", + "tokio 1.3.0", "transaction-builder-generated", "warp", ] @@ -1648,7 +1654,7 @@ dependencies = [ "serde", "serde_json", "storage-interface", - "tokio", + "tokio 1.3.0", "transaction-builder-generated", "vm-genesis", "vm-validator", @@ -1673,7 +1679,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "tokio", + "tokio 1.3.0", "warp", ] @@ -1726,7 +1732,7 @@ dependencies = [ "serde", "storage-interface", "thiserror", - "tokio", + "tokio 1.3.0", "transaction-builder-generated", "vm-validator", ] @@ -1816,7 +1822,7 @@ dependencies = [ "storage-interface", "storage-service", "subscription-service", - "tokio", + "tokio 1.3.0", "vm-validator", ] @@ -1835,7 +1841,7 @@ dependencies = [ "prometheus", "rusty-fork", "serde_json", - "tokio", + "tokio 1.3.0", ] [[package]] @@ -1925,7 +1931,7 @@ dependencies = [ "storage-service", "structopt 0.3.21", "subscription-service", - "tokio", + "tokio 1.3.0", ] [[package]] @@ -1971,7 +1977,7 @@ version = "0.1.0" dependencies = [ "diem-logger", "diem-workspace-hack", - "tokio", + "tokio 1.3.0", ] [[package]] @@ -1995,7 +2001,7 @@ dependencies = [ "serde_json", "storage-interface", "thiserror", - "tokio", + "tokio 1.3.0", "ureq", "vm-validator", ] @@ -2131,7 +2137,7 @@ dependencies = [ "serde", "serde_json", "structopt 0.3.21", - "tokio", + "tokio 1.3.0", ] [[package]] @@ -2166,7 +2172,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "chrono", "diem-crypto", "diem-crypto-derive", @@ -2279,7 +2285,7 @@ name = "diem-workspace-hack" version = "0.1.0" dependencies = [ "byteorder", - "bytes", + "bytes 0.5.6", "cc", "chrono", "itertools 0.9.0", @@ -3200,7 +3206,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "futures-sink", @@ -3208,7 +3214,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", + "tokio 0.2.25", "tokio-util", "tracing", "tracing-futures", @@ -3248,7 +3254,7 @@ checksum = "ed18eb2459bf1a09ad2d6b1547840c3e5e62882fa09b9a6a20b1de8e3228848f" dependencies = [ "base64 0.12.3", "bitflags", - "bytes", + "bytes 0.5.6", "headers-core", "http", "mime", @@ -3336,7 +3342,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "itoa", ] @@ -3347,7 +3353,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ - "bytes", + "bytes 0.5.6", "http", ] @@ -3384,7 +3390,7 @@ version = "0.13.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-channel", "futures-core", "futures-util", @@ -3396,7 +3402,7 @@ dependencies = [ "itoa", "pin-project 1.0.2", "socket2", - "tokio", + "tokio 0.2.25", "tower-service", "tracing", "want", @@ -3408,10 +3414,10 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ - "bytes", + "bytes 0.5.6", "hyper", "native-tls", - "tokio", + "tokio 0.2.25", "tokio-tls", ] @@ -3475,7 +3481,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" dependencies = [ - "bytes", + "bytes 0.5.6", ] [[package]] @@ -3639,7 +3645,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57f95fd36c08ce592e67400a0f1a66f432196997d5a7e9a97e8743c33d8a9312" dependencies = [ "base64 0.12.3", - "bytes", + "bytes 0.5.6", "chrono", "serde", "serde-value", @@ -3670,7 +3676,7 @@ checksum = "f4f52dbe2c0e7ca54e43f1bc7b77b916750e63d7694e5a18c09b11307acc6b9d" dependencies = [ "Inflector", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "chrono", "dirs 3.0.1", "either", @@ -3688,7 +3694,7 @@ dependencies = [ "static_assertions", "thiserror", "time 0.2.23", - "tokio", + "tokio 0.2.25", "url", ] @@ -3780,9 +3786,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.81" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" +checksum = "538c092e5586f4cdd7dd8078c4a79220e3e168880218124dcbce860f0ea938c6" [[package]] name = "libfuzzer-sys" @@ -3894,7 +3900,7 @@ dependencies = [ name = "memsocket" version = "0.1.0" dependencies = [ - "bytes", + "bytes 0.5.6", "diem-infallible", "diem-workspace-hack", "futures 0.3.8", @@ -3929,9 +3935,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.6.22" +version = "0.6.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" dependencies = [ "cfg-if 0.1.10", "fuchsia-zircon", @@ -3940,12 +3946,25 @@ dependencies = [ "kernel32-sys", "libc", "log", - "miow 0.2.1", + "miow 0.2.2", "net2", "slab", "winapi 0.2.8", ] +[[package]] +name = "mio" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2182a122f3b7f3f5329cb1972cee089ba2459a0a80a56935e6e674f096f8d839" +dependencies = [ + "libc", + "log", + "miow 0.3.6", + "ntapi", + "winapi 0.3.9", +] + [[package]] name = "mio-named-pipes" version = "0.1.7" @@ -3953,8 +3972,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ "log", - "mio", - "miow 0.3.5", + "mio 0.6.23", + "miow 0.3.6", "winapi 0.3.9", ] @@ -3966,14 +3985,14 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.23", ] [[package]] name = "miow" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" dependencies = [ "kernel32-sys", "net2", @@ -3983,9 +4002,9 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e" +checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" dependencies = [ "socket2", "winapi 0.3.9", @@ -4208,7 +4227,7 @@ dependencies = [ "shell-words", "simplelog", "spec-lang", - "tokio", + "tokio 1.3.0", "toml", "vm", ] @@ -4366,7 +4385,7 @@ dependencies = [ name = "netcore" version = "0.1.0" dependencies = [ - "bytes", + "bytes 0.5.6", "diem-logger", "diem-network-address", "diem-types", @@ -4375,7 +4394,7 @@ dependencies = [ "memsocket", "pin-project 1.0.2", "serde", - "tokio", + "tokio 1.3.0", "url", ] @@ -4385,7 +4404,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "channel", "criterion", "diem-bitvec", @@ -4418,7 +4437,7 @@ dependencies = [ "short-hex-str", "socket-bench-server", "thiserror", - "tokio", + "tokio 1.3.0", "tokio-retry", "tokio-util", ] @@ -4446,7 +4465,7 @@ dependencies = [ "rand 0.7.3", "serde", "subscription-service", - "tokio", + "tokio 1.3.0", "tokio-retry", ] @@ -4470,7 +4489,7 @@ dependencies = [ "network", "once_cell", "subscription-service", - "tokio", + "tokio 1.3.0", ] [[package]] @@ -4507,6 +4526,15 @@ dependencies = [ "version_check", ] +[[package]] +name = "ntapi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "num" version = "0.2.1" @@ -5093,7 +5121,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce49aefe0a6144a45de32927c77bd2859a5f7677b55f220ae5b744e87389c212" dependencies = [ - "bytes", + "bytes 0.5.6", "prost-derive", ] @@ -5103,7 +5131,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02b10678c913ecbd69350e8535c3aef91a8676c0773fc1d7b95cdd196d7f2f26" dependencies = [ - "bytes", + "bytes 0.5.6", "heck", "itertools 0.8.2", "log", @@ -5134,7 +5162,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa" dependencies = [ - "bytes", + "bytes 0.5.6", "prost", ] @@ -5507,7 +5535,7 @@ checksum = "fb15d6255c792356a0f578d8a645c677904dc02e862bebe2ecc18e0c01b9a0ce" dependencies = [ "async-compression", "base64 0.13.0", - "bytes", + "bytes 0.5.6", "encoding_rs", "futures-core", "futures-util", @@ -5527,7 +5555,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.0", - "tokio", + "tokio 0.2.25", "tokio-tls", "url", "wasm-bindgen", @@ -5585,7 +5613,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7af1c42491edaa3b2582c6f3a0221f5ef4ed7a02c71cf1f614bb12877e1d44dd" dependencies = [ "async-trait", - "bytes", + "bytes 0.5.6", "futures 0.3.8", "rusoto_core", "serde_urlencoded 0.6.1", @@ -5600,7 +5628,7 @@ checksum = "e977941ee0658df96fca7291ecc6fc9a754600b21ad84b959eb1dbbc9d5abcc7" dependencies = [ "async-trait", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "crc32fast", "futures 0.3.8", "http", @@ -5616,7 +5644,7 @@ dependencies = [ "rustc_version", "serde", "serde_json", - "tokio", + "tokio 0.2.25", "xml-rs", ] @@ -5636,7 +5664,7 @@ dependencies = [ "serde", "serde_json", "shlex", - "tokio", + "tokio 0.2.25", "zeroize", ] @@ -5647,7 +5675,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1146e37a7c1df56471ea67825fe09bbbd37984b5f6e201d8b2e0be4ee15643d8" dependencies = [ "async-trait", - "bytes", + "bytes 0.5.6", "futures 0.3.8", "rusoto_core", "xml-rs", @@ -5660,7 +5688,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97a740a88dde8ded81b6f2cff9cd5e054a5a2e38a38397260f7acdd2c85d17dd" dependencies = [ "base64 0.12.3", - "bytes", + "bytes 0.5.6", "futures 0.3.8", "hex", "hmac 0.8.1", @@ -5675,7 +5703,7 @@ dependencies = [ "serde", "sha2", "time 0.2.23", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -5685,7 +5713,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3815b8c0fc1c50caf9e87603f23daadfedb18d854de287b361c69f68dc9d49e0" dependencies = [ "async-trait", - "bytes", + "bytes 0.5.6", "chrono", "futures 0.3.8", "rusoto_core", @@ -6277,7 +6305,7 @@ dependencies = [ "rust_decimal", "rusty-fork", "statistical", - "tokio", + "tokio 1.3.0", "transaction-builder", ] @@ -6297,19 +6325,18 @@ dependencies = [ "network", "network-builder", "rand 0.7.3", - "tokio", + "tokio 1.3.0", "tokio-util", ] [[package]] name = "socket2" -version = "0.3.15" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "redox_syscall", "winapi 0.3.9", ] @@ -6359,7 +6386,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "channel", "compiled-stdlib", "diem-config", @@ -6393,7 +6420,7 @@ dependencies = [ "storage-interface", "storage-service", "subscription-service", - "tokio", + "tokio 1.3.0", "transaction-builder", "vm-genesis", ] @@ -6546,7 +6573,7 @@ dependencies = [ "rand 0.7.3", "storage-client", "storage-interface", - "tokio", + "tokio 1.3.0", ] [[package]] @@ -6905,25 +6932,45 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "0.2.22" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "iovec", "lazy_static", "libc", "memchr", - "mio", + "mio 0.6.23", "mio-named-pipes", "mio-uds", "num_cpus", "pin-project-lite 0.1.11", "signal-hook-registry", "slab", - "tokio-macros", + "tokio-macros 0.2.6", + "winapi 0.3.9", +] + +[[package]] +name = "tokio" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d56477f6ed99e10225f38f9f75f872f29b8b8bd8c0b946f63345bb144e9eeda" +dependencies = [ + "autocfg 1.0.1", + "bytes 1.0.1", + "libc", + "memchr", + "mio 0.7.10", + "num_cpus", + "once_cell", + "parking_lot", + "pin-project-lite 0.2.0", + "signal-hook-registry", + "tokio-macros 1.1.0", "winapi 0.3.9", ] @@ -6939,9 +6986,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 1.0.24", + "quote 1.0.7", + "syn 1.0.53", +] + +[[package]] +name = "tokio-macros" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" +checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -6978,7 +7036,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -6990,7 +7048,7 @@ dependencies = [ "futures-util", "log", "pin-project 0.4.27", - "tokio", + "tokio 0.2.25", "tungstenite", ] @@ -7000,13 +7058,13 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-core", "futures-io", "futures-sink", "log", "pin-project-lite 0.1.11", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -7128,7 +7186,7 @@ checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" dependencies = [ "base64 0.12.3", "byteorder", - "bytes", + "bytes 0.5.6", "http", "httparse", "input_buffer", @@ -7403,7 +7461,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f41be6df54c97904af01aa23e613d4521eed7ab23537cede692d4058f6449407" dependencies = [ - "bytes", + "bytes 0.5.6", "futures 0.3.8", "headers", "http", @@ -7417,7 +7475,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.6.1", - "tokio", + "tokio 0.2.25", "tokio-tungstenite", "tower-service", "tracing", diff --git a/client/faucet/Cargo.toml b/client/faucet/Cargo.toml index d8eb6385f72b..cad6006d5285 100644 --- a/client/faucet/Cargo.toml +++ b/client/faucet/Cargo.toml @@ -16,7 +16,7 @@ reqwest = { version = "0.10.9", features = ["blocking"], default-features = fals serde = "1.0.117" serde_derive = "1.0.117" structopt = "0.3.21" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } warp = "0.2.5" generate-key = { path = "../../config/generate-key", version = "0.1.0" } diff --git a/client/json-rpc/Cargo.toml b/client/json-rpc/Cargo.toml index 7e68f8ad3147..69add913d9dc 100644 --- a/client/json-rpc/Cargo.toml +++ b/client/json-rpc/Cargo.toml @@ -18,7 +18,7 @@ rand = "0.7.3" reqwest = { version = "0.10.9", features = ["blocking", "json"], default_features = false } serde = { version = "1.0.117", default-features = false } serde_json = "1.0.60" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } diem-crypto = { path = "../../crypto/crypto", version = "0.1.0" } bcs = "0.1.1" diff --git a/common/bounded-executor/Cargo.toml b/common/bounded-executor/Cargo.toml index dcd03f30c059..8dc3489af73e 100644 --- a/common/bounded-executor/Cargo.toml +++ b/common/bounded-executor/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] futures = "0.3.8" diem-workspace-hack = { path = "../workspace-hack", version = "0.1.0" } -tokio = { version = "0.2.22", features = ["sync"] } +tokio = { version = "1.3.0", features = ["sync"] } [dev-dependencies] -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } diff --git a/common/channel/Cargo.toml b/common/channel/Cargo.toml index d0042378e9ec..dd5e5c6d088b 100644 --- a/common/channel/Cargo.toml +++ b/common/channel/Cargo.toml @@ -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 = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } diff --git a/common/debug-interface/Cargo.toml b/common/debug-interface/Cargo.toml index ee634b261cce..87acfcc3edfe 100644 --- a/common/debug-interface/Cargo.toml +++ b/common/debug-interface/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] anyhow = "1.0.34" bytes = "0.5.6" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } reqwest = { version = "0.10.9", features = ["blocking", "json"], default_features = false } warp = "0.2.5" diff --git a/common/metrics/Cargo.toml b/common/metrics/Cargo.toml index 94a8c9b7a022..a7c9097f4f3e 100644 --- a/common/metrics/Cargo.toml +++ b/common/metrics/Cargo.toml @@ -16,7 +16,7 @@ hyper = "0.13.9" once_cell = "1.4.1" prometheus = { version = "0.11.0", default-features = false } serde_json = "1.0.60" -tokio = "0.2.22" +tokio = "1.3.0" diem-logger = { path = "../logger", version = "0.1.0" } diem-metrics-core = { path = "../metrics-core", version = "0.1.0" } diff --git a/common/retrier/Cargo.toml b/common/retrier/Cargo.toml index 7c613e9793d3..094a798b9c4a 100644 --- a/common/retrier/Cargo.toml +++ b/common/retrier/Cargo.toml @@ -11,5 +11,5 @@ edition = "2018" [dependencies] diem-workspace-hack = { path = "..//workspace-hack", version = "0.1.0" } -tokio = { version = "0.2.22", features = ["time"] } +tokio = { version = "1.3.0", features = ["time"] } diem-logger = { path = "../../common/logger", version = "0.1.0"} diff --git a/common/trace/Cargo.toml b/common/trace/Cargo.toml index 0e4317acab88..cb0ef358d846 100644 --- a/common/trace/Cargo.toml +++ b/common/trace/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] chrono = "0.4.19" structopt = "0.3.21" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } serde_json = "1.0.60" serde = "1.0.117" anyhow = "1.0.34" diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml index d359dc0d2c26..54b574008d18 100644 --- a/consensus/Cargo.toml +++ b/consensus/Cargo.toml @@ -27,7 +27,7 @@ serde = { version = "1.0.117", default-features = false } serde_json = "1.0.60" termion = { version = "1.5.5", default-features = false } thiserror = "1.0.22" -tokio = { version = "0.2.22", 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 } diff --git a/diem-node/Cargo.toml b/diem-node/Cargo.toml index 66f4b18e8004..6c2031ce4b20 100644 --- a/diem-node/Cargo.toml +++ b/diem-node/Cargo.toml @@ -14,7 +14,7 @@ fail = "0.4.0" futures = "0.3.8" jemallocator = { version = "0.3.2", features = ["profiling", "unprefixed_malloc_on_supported_platforms"] } structopt = "0.3.21" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } backup-service = { path = "../storage/backup/backup-service", version = "0.1.0" } consensus = { path = "../consensus", version = "0.1.0" } diff --git a/json-rpc/Cargo.toml b/json-rpc/Cargo.toml index 3e16b9d458cf..e72a46176653 100644 --- a/json-rpc/Cargo.toml +++ b/json-rpc/Cargo.toml @@ -19,7 +19,7 @@ once_cell = "1.4.1" rand = "0.7.3" serde_json = "1.0.60" serde = { version = "1.0.117", default-features = false } -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } warp = "0.2.5" reqwest = { version = "0.10.9", features = ["blocking", "json"], default_features = false, optional = true } proptest = { version = "0.10.1", optional = true } diff --git a/language/diem-tools/diem-events-fetcher/Cargo.toml b/language/diem-tools/diem-events-fetcher/Cargo.toml index 83792e703499..1a412bdf2e27 100644 --- a/language/diem-tools/diem-events-fetcher/Cargo.toml +++ b/language/diem-tools/diem-events-fetcher/Cargo.toml @@ -17,7 +17,7 @@ hex = "0.4.2" reqwest = { version = "0.10.9", features = ["blocking", "json"] } structopt = "0.3.21" futures = "0.3.8" -tokio = { version = "0.2.22", 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" } diff --git a/language/move-prover/Cargo.toml b/language/move-prover/Cargo.toml index 1e926144f975..e4246a75186a 100644 --- a/language/move-prover/Cargo.toml +++ b/language/move-prover/Cargo.toml @@ -40,7 +40,7 @@ serde = { version = "1.0.117", features = ["derive"] } serde_json = "1.0.60" simplelog = "0.8.0" once_cell = "1.4.1" -tokio = { version = "0.2", features = ["full"] } +tokio = { version = "1.3", features = ["full"] } toml = "0.5.7" [dev-dependencies] diff --git a/mempool/Cargo.toml b/mempool/Cargo.toml index b5576b216bcb..611556e1a4c3 100644 --- a/mempool/Cargo.toml +++ b/mempool/Cargo.toml @@ -18,7 +18,7 @@ once_cell = "1.4.1" proptest = { version = "0.10.1", optional = true } rayon = "1.4.1" serde = { version = "1.0.117", default-features = false } -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } bounded-executor = { path = "../common/bounded-executor", version = "0.1.0" } channel = { path = "../common/channel", version = "0.1.0" } diff --git a/network/Cargo.toml b/network/Cargo.toml index 1e8922225ce8..7e03ae85ed56 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -24,7 +24,7 @@ rand_core = { version = "0.5.1", optional = true } serde = { version = "1.0.117", default-features = false } serde_bytes = "0.11.5" thiserror = "1.0.22" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } tokio-retry = "0.2.0" tokio-util = { version = "0.3.1", features = ["codec"] } diff --git a/network/builder/Cargo.toml b/network/builder/Cargo.toml index c3b102946578..ed326b94d550 100644 --- a/network/builder/Cargo.toml +++ b/network/builder/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" futures = "0.3.8" rand = "0.7.3" serde = { version = "1.0.117", default-features = false } -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } tokio-retry = "0.2.0" diff --git a/network/netcore/Cargo.toml b/network/netcore/Cargo.toml index 291d2507038d..c5204e3fdcd6 100644 --- a/network/netcore/Cargo.toml +++ b/network/netcore/Cargo.toml @@ -14,7 +14,7 @@ bytes = "0.5.6" futures = "0.3.8" pin-project = "1.0.2" serde = { version = "1.0.117", default-features = false } -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } url = { version = "2.1.1" } diem-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" } diff --git a/network/simple-onchain-discovery/Cargo.toml b/network/simple-onchain-discovery/Cargo.toml index ab7fc52e56c8..e0d47616781b 100644 --- a/network/simple-onchain-discovery/Cargo.toml +++ b/network/simple-onchain-discovery/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" anyhow = "1.0.34" futures = "0.3.8" once_cell = "1.4.1" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } channel = {path = "../../common/channel", version = "0.1.0"} bcs = "0.1.1" diff --git a/network/socket-bench-server/Cargo.toml b/network/socket-bench-server/Cargo.toml index 21e30f8edc60..3a8f478eced8 100644 --- a/network/socket-bench-server/Cargo.toml +++ b/network/socket-bench-server/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] futures = "0.3.8" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } tokio-util = { version = "0.3.1", features = ["codec"] } diem-crypto = { path = "../../crypto/crypto" } diff --git a/secure/json-rpc/Cargo.toml b/secure/json-rpc/Cargo.toml index 5ea261ac8259..5f3dc9634ce2 100644 --- a/secure/json-rpc/Cargo.toml +++ b/secure/json-rpc/Cargo.toml @@ -27,7 +27,7 @@ diem-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" anyhow = "1.0.34" futures = "0.3.8" proptest = "0.10.1" -tokio = { version = "0.2.22", 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"} diff --git a/secure/key-manager/Cargo.toml b/secure/key-manager/Cargo.toml index 5c6ca03a0f89..ffe57298e480 100644 --- a/secure/key-manager/Cargo.toml +++ b/secure/key-manager/Cargo.toml @@ -32,7 +32,7 @@ transaction-builder-generated = { path = "../../client/transaction-builder", ver anyhow = "1.0.34" futures = "0.3.8" rand = "0.7.3" -tokio = { version = "0.2.22", 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" } diff --git a/state-synchronizer/Cargo.toml b/state-synchronizer/Cargo.toml index 4d312257427d..7351a4eadbf8 100644 --- a/state-synchronizer/Cargo.toml +++ b/state-synchronizer/Cargo.toml @@ -16,7 +16,7 @@ futures = "0.3.8" serde = { version = "1.0.117", default-features = false } once_cell = "1.4.1" rand = "0.7.3" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } itertools = { version = "0.9.0", default-features = false } proptest = { version = "0.10.1", optional = true } diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml index 0881f975ca99..a796c6f1c95e 100644 --- a/storage/backup/backup-cli/Cargo.toml +++ b/storage/backup/backup-cli/Cargo.toml @@ -26,7 +26,7 @@ serde = { version = "1.0.117", features = ["derive"] } serde_json = "1.0.60" structopt = "0.3.21" toml = "0.5.7" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } tokio-util = { version = "0.3.1", features = ["compat"] } executor = { path = "../../../execution/executor", version = "0.1.0" } diff --git a/storage/backup/backup-service/Cargo.toml b/storage/backup/backup-service/Cargo.toml index 0ef45910d40d..22f3d23d264c 100644 --- a/storage/backup/backup-service/Cargo.toml +++ b/storage/backup/backup-service/Cargo.toml @@ -15,7 +15,7 @@ futures = "0.3.8" hyper = "0.13.9" once_cell = "1.4.1" serde = { version = "1.0.117", default-features = false } -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } warp = "0.2.5" bcs = "0.1.1" diff --git a/storage/storage-service/Cargo.toml b/storage/storage-service/Cargo.toml index 6e3fed197739..ba96dfd08c45 100644 --- a/storage/storage-service/Cargo.toml +++ b/storage/storage-service/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] anyhow = "1.0.34" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } futures = "0.3.8" bcs = "0.1.1" diff --git a/testsuite/cli/Cargo.toml b/testsuite/cli/Cargo.toml index a014b50148ec..255fd9d2f4a9 100644 --- a/testsuite/cli/Cargo.toml +++ b/testsuite/cli/Cargo.toml @@ -21,7 +21,7 @@ once_cell = "1.4.1" reqwest = { version = "0.10.9", features = ["blocking", "json"] } serde = { version = "1.0.117", features = ["derive"] } structopt = "0.3.21" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } walkdir = "2.3.1" diem-config = { path = "../../config", version = "0.1.0" } diff --git a/testsuite/cluster-test/Cargo.toml b/testsuite/cluster-test/Cargo.toml index 342510e5a2f9..5c252e1ef4e5 100644 --- a/testsuite/cluster-test/Cargo.toml +++ b/testsuite/cluster-test/Cargo.toml @@ -62,7 +62,7 @@ state-synchronizer = { path = "../../state-synchronizer", version = "0.1.0" } transaction-builder = { path = "../../language/transaction-builder", version = "0.1.0" } futures = "0.3.8" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } async-trait = "0.1.42" kube = { version = "0.42.0" } diff --git a/testsuite/smoke-test/Cargo.toml b/testsuite/smoke-test/Cargo.toml index 23467d3ef7ab..afe52abc2793 100644 --- a/testsuite/smoke-test/Cargo.toml +++ b/testsuite/smoke-test/Cargo.toml @@ -20,7 +20,7 @@ regex = "1.4.2" rust_decimal = "1.8.1" rusty-fork = "0.3.0" statistical = "1.0.0" -tokio = { version = "0.2.22", 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"] }