diff --git a/Cargo.lock b/Cargo.lock index ee0de5c7e5c8..d598d820885f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -178,13 +178,34 @@ 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", "pin-project-lite 0.1.11", ] +[[package]] +name = "async-stream" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3670df70cbc01729f901f94c887814b3c68db038aad1329a418bae178bc5295c" +dependencies = [ + "async-stream-impl", + "futures-core", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3548b8efc9f8e8a5a0a2808c5bd8451a9031b9e5b879a79590304ae928b0a70" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.7", + "syn 1.0.53", +] + [[package]] name = "async-trait" version = "0.1.42" @@ -243,7 +264,7 @@ dependencies = [ "backup-service", "bcs", "byteorder", - "bytes", + "bytes 0.5.6", "diem-config", "diem-crypto", "diem-infallible", @@ -273,8 +294,8 @@ dependencies = [ "serde_json", "storage-interface", "structopt 0.3.21", - "tokio", - "tokio-util", + "tokio 0.2.22", + "tokio-util 0.6.0", "toml", ] @@ -284,7 +305,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "diem-config", "diem-crypto", "diem-logger", @@ -299,7 +320,7 @@ dependencies = [ "reqwest", "serde", "storage-interface", - "tokio", + "tokio 0.2.22", "warp", ] @@ -460,7 +481,7 @@ version = "0.1.0" dependencies = [ "diem-workspace-hack", "futures 0.3.8", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -581,6 +602,12 @@ dependencies = [ "serde", ] +[[package]] +name = "bytes" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f8e949d755f9d79112b5bb46938e0ef9d3804a0b16dfab13aafcaa5f0fa72" + [[package]] name = "c_linked_list" version = "1.1.1" @@ -657,7 +684,7 @@ dependencies = [ "diem-types", "diem-workspace-hack", "futures 0.3.8", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -747,7 +774,7 @@ dependencies = [ "rustyline", "serde", "structopt 0.3.21", - "tokio", + "tokio 0.2.22", "transaction-builder", "walkdir", ] @@ -815,7 +842,7 @@ dependencies = [ "state-synchronizer", "structopt 0.3.21", "termion", - "tokio", + "tokio 0.2.22", "toml", "transaction-builder", ] @@ -906,7 +933,7 @@ dependencies = [ "async-trait", "bcs", "byteorder", - "bytes", + "bytes 0.5.6", "channel", "consensus-types", "diem-config", @@ -945,7 +972,7 @@ dependencies = [ "tempfile", "termion", "thiserror", - "tokio", + "tokio 0.2.22", "vm-genesis", "vm-validator", ] @@ -1276,12 +1303,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 0.2.22", "warp", ] @@ -1356,7 +1383,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 +1473,7 @@ dependencies = [ "hex", "reqwest", "structopt 0.3.21", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -1471,7 +1498,7 @@ dependencies = [ "serde_json", "structopt 0.3.21", "tempfile", - "tokio", + "tokio 0.2.22", "transaction-builder-generated", "warp", ] @@ -1648,7 +1675,7 @@ dependencies = [ "serde", "serde_json", "storage-interface", - "tokio", + "tokio 0.2.22", "transaction-builder-generated", "vm-genesis", "vm-validator", @@ -1673,7 +1700,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "tokio", + "tokio 0.2.22", "warp", ] @@ -1726,7 +1753,7 @@ dependencies = [ "serde", "storage-interface", "thiserror", - "tokio", + "tokio 0.2.22", "transaction-builder-generated", "vm-validator", ] @@ -1816,7 +1843,7 @@ dependencies = [ "storage-interface", "storage-service", "subscription-service", - "tokio", + "tokio 0.2.22", "vm-validator", ] @@ -1835,7 +1862,7 @@ dependencies = [ "prometheus", "rusty-fork", "serde_json", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -1925,7 +1952,7 @@ dependencies = [ "storage-service", "structopt 0.3.21", "subscription-service", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -1971,7 +1998,7 @@ version = "0.1.0" dependencies = [ "diem-logger", "diem-workspace-hack", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -1995,7 +2022,7 @@ dependencies = [ "serde_json", "storage-interface", "thiserror", - "tokio", + "tokio 0.2.22", "ureq", "vm-validator", ] @@ -2131,7 +2158,7 @@ dependencies = [ "serde", "serde_json", "structopt 0.3.21", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -2166,7 +2193,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "chrono", "diem-crypto", "diem-crypto-derive", @@ -2279,7 +2306,7 @@ name = "diem-workspace-hack" version = "0.1.0" dependencies = [ "byteorder", - "bytes", + "bytes 0.5.6", "cc", "chrono", "itertools 0.9.0", @@ -3200,7 +3227,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,8 +3235,8 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", - "tokio-util", + "tokio 0.2.22", + "tokio-util 0.3.1", "tracing", "tracing-futures", ] @@ -3248,7 +3275,7 @@ checksum = "ed18eb2459bf1a09ad2d6b1547840c3e5e62882fa09b9a6a20b1de8e3228848f" dependencies = [ "base64 0.12.3", "bitflags", - "bytes", + "bytes 0.5.6", "headers-core", "http", "mime", @@ -3336,7 +3363,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 +3374,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 +3411,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 +3423,7 @@ dependencies = [ "itoa", "pin-project 1.0.2", "socket2", - "tokio", + "tokio 0.2.22", "tower-service", "tracing", "want", @@ -3408,10 +3435,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.22", "tokio-tls", ] @@ -3475,7 +3502,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 +3666,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 +3697,7 @@ checksum = "f4f52dbe2c0e7ca54e43f1bc7b77b916750e63d7694e5a18c09b11307acc6b9d" dependencies = [ "Inflector", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "chrono", "dirs 3.0.1", "either", @@ -3688,7 +3715,7 @@ dependencies = [ "static_assertions", "thiserror", "time 0.2.23", - "tokio", + "tokio 0.2.22", "url", ] @@ -3894,7 +3921,7 @@ dependencies = [ name = "memsocket" version = "0.1.0" dependencies = [ - "bytes", + "bytes 0.5.6", "diem-infallible", "diem-workspace-hack", "futures 0.3.8", @@ -4208,7 +4235,7 @@ dependencies = [ "shell-words", "simplelog", "spec-lang", - "tokio", + "tokio 0.2.22", "toml", "vm", ] @@ -4366,7 +4393,7 @@ dependencies = [ name = "netcore" version = "0.1.0" dependencies = [ - "bytes", + "bytes 0.5.6", "diem-logger", "diem-network-address", "diem-types", @@ -4375,7 +4402,7 @@ dependencies = [ "memsocket", "pin-project 1.0.2", "serde", - "tokio", + "tokio 0.2.22", "url", ] @@ -4385,7 +4412,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "channel", "criterion", "diem-bitvec", @@ -4418,9 +4445,9 @@ dependencies = [ "short-hex-str", "socket-bench-server", "thiserror", - "tokio", + "tokio 0.2.22", "tokio-retry", - "tokio-util", + "tokio-util 0.6.0", ] [[package]] @@ -4446,7 +4473,7 @@ dependencies = [ "rand 0.7.3", "serde", "subscription-service", - "tokio", + "tokio 0.2.22", "tokio-retry", ] @@ -4470,7 +4497,7 @@ dependencies = [ "network", "once_cell", "subscription-service", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -5093,7 +5120,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 +5130,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 +5161,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 +5534,7 @@ checksum = "fb15d6255c792356a0f578d8a645c677904dc02e862bebe2ecc18e0c01b9a0ce" dependencies = [ "async-compression", "base64 0.13.0", - "bytes", + "bytes 0.5.6", "encoding_rs", "futures-core", "futures-util", @@ -5527,7 +5554,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.0", - "tokio", + "tokio 0.2.22", "tokio-tls", "url", "wasm-bindgen", @@ -5585,7 +5612,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 +5627,7 @@ checksum = "e977941ee0658df96fca7291ecc6fc9a754600b21ad84b959eb1dbbc9d5abcc7" dependencies = [ "async-trait", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "crc32fast", "futures 0.3.8", "http", @@ -5616,7 +5643,7 @@ dependencies = [ "rustc_version", "serde", "serde_json", - "tokio", + "tokio 0.2.22", "xml-rs", ] @@ -5636,7 +5663,7 @@ dependencies = [ "serde", "serde_json", "shlex", - "tokio", + "tokio 0.2.22", "zeroize", ] @@ -5647,7 +5674,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 +5687,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 +5702,7 @@ dependencies = [ "serde", "sha2", "time 0.2.23", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -5685,7 +5712,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 +6304,7 @@ dependencies = [ "rust_decimal", "rusty-fork", "statistical", - "tokio", + "tokio 0.2.22", "transaction-builder", ] @@ -6297,8 +6324,8 @@ dependencies = [ "network", "network-builder", "rand 0.7.3", - "tokio", - "tokio-util", + "tokio 0.2.22", + "tokio-util 0.6.0", ] [[package]] @@ -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 0.2.22", "transaction-builder", "vm-genesis", ] @@ -6546,7 +6573,7 @@ dependencies = [ "rand 0.7.3", "storage-client", "storage-interface", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -6909,7 +6936,7 @@ version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "iovec", @@ -6927,6 +6954,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "tokio" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f4bfdcbd00fa893ac0549b38aa27080636a0104b0d0c38475a99439405e1df8" +dependencies = [ + "autocfg 1.0.1", + "pin-project-lite 0.2.0", +] + [[package]] name = "tokio-executor" version = "0.1.10" @@ -6959,6 +6996,18 @@ dependencies = [ "tokio-timer", ] +[[package]] +name = "tokio-stream" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3be913b74b13210c8fe04b17ab833f5a124f45b93d0f99f59fff621f64392a" +dependencies = [ + "async-stream", + "futures-core", + "pin-project-lite 0.2.0", + "tokio 1.0.0", +] + [[package]] name = "tokio-timer" version = "0.2.13" @@ -6978,7 +7027,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -6990,7 +7039,7 @@ dependencies = [ "futures-util", "log", "pin-project 0.4.27", - "tokio", + "tokio 0.2.22", "tungstenite", ] @@ -7000,13 +7049,28 @@ 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.22", +] + +[[package]] +name = "tokio-util" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36135b7e7da911f5f8b9331209f7fab4cc13498f3fff52f72a710c78187e3148" +dependencies = [ + "bytes 1.0.0", + "futures-core", + "futures-io", + "futures-sink", + "log", + "pin-project-lite 0.2.0", + "tokio 1.0.0", + "tokio-stream", ] [[package]] @@ -7128,7 +7192,7 @@ checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" dependencies = [ "base64 0.12.3", "byteorder", - "bytes", + "bytes 0.5.6", "http", "httparse", "input_buffer", @@ -7403,7 +7467,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 +7481,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.6.1", - "tokio", + "tokio 0.2.22", "tokio-tungstenite", "tower-service", "tracing", diff --git a/network/Cargo.toml b/network/Cargo.toml index 1e8922225ce8..5f8176de71aa 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -26,7 +26,7 @@ serde_bytes = "0.11.5" thiserror = "1.0.22" tokio = { version = "0.2.22", features = ["full"] } tokio-retry = "0.2.0" -tokio-util = { version = "0.3.1", features = ["codec"] } +tokio-util = { version = "0.6.0", features = ["codec"] } bitvec = { path = "../common/bitvec", version = "0.1.0", package = "diem-bitvec" } channel = { path = "../common/channel", version = "0.1.0" } diff --git a/network/socket-bench-server/Cargo.toml b/network/socket-bench-server/Cargo.toml index 21e30f8edc60..ecb6cdeb8a47 100644 --- a/network/socket-bench-server/Cargo.toml +++ b/network/socket-bench-server/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] futures = "0.3.8" tokio = { version = "0.2.22", features = ["full"] } -tokio-util = { version = "0.3.1", features = ["codec"] } +tokio-util = { version = "0.6.0", features = ["codec"] } diem-crypto = { path = "../../crypto/crypto" } diem-config = { path = "../../config" } diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml index 0881f975ca99..10ade272ebd3 100644 --- a/storage/backup/backup-cli/Cargo.toml +++ b/storage/backup/backup-cli/Cargo.toml @@ -27,7 +27,7 @@ serde_json = "1.0.60" structopt = "0.3.21" toml = "0.5.7" tokio = { version = "0.2.22", features = ["full"] } -tokio-util = { version = "0.3.1", features = ["compat"] } +tokio-util = { version = "0.6.0", features = ["compat"] } executor = { path = "../../../execution/executor", version = "0.1.0" } executor-test-helpers = { path = "../../../execution/executor-test-helpers", version = "0.1.0", optional = true }