diff --git a/Cargo.lock b/Cargo.lock index 2f3092fb7462..6c998af326ea 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", @@ -241,7 +241,7 @@ dependencies = [ "async-trait", "backup-service", "byteorder", - "bytes", + "bytes 0.5.6", "executor", "executor-test-helpers", "executor-types", @@ -272,8 +272,8 @@ dependencies = [ "serde_json", "storage-interface", "structopt 0.3.20", - "tokio", - "tokio-util", + "tokio 0.2.22", + "tokio-util 0.5.0", "toml", ] @@ -282,7 +282,7 @@ name = "backup-service" version = "0.1.0" dependencies = [ "anyhow", - "bytes", + "bytes 0.5.6", "futures 0.3.8", "hyper", "libra-canonical-serialization", @@ -298,7 +298,7 @@ dependencies = [ "reqwest", "serde", "storage-interface", - "tokio", + "tokio 0.2.22", "warp", ] @@ -439,7 +439,7 @@ version = "0.1.0" dependencies = [ "futures 0.3.8", "libra-workspace-hack", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -560,6 +560,12 @@ dependencies = [ "serde", ] +[[package]] +name = "bytes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0dcbc35f504eb6fc275a6d20e4ebcda18cf50d40ba6fabff8c711fa16cb3b16" + [[package]] name = "c_linked_list" version = "1.1.1" @@ -636,7 +642,7 @@ dependencies = [ "libra-metrics", "libra-types", "libra-workspace-hack", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -726,7 +732,7 @@ dependencies = [ "rustyline", "serde", "structopt 0.3.20", - "tokio", + "tokio 0.2.22", "transaction-builder", "walkdir", ] @@ -803,7 +809,7 @@ dependencies = [ "state-synchronizer", "structopt 0.3.20", "termion", - "tokio", + "tokio 0.2.22", "toml", "transaction-builder", ] @@ -893,7 +899,7 @@ dependencies = [ "anyhow", "async-trait", "byteorder", - "bytes", + "bytes 0.5.6", "channel", "consensus-types", "execution-correctness", @@ -933,7 +939,7 @@ dependencies = [ "tempfile", "termion", "thiserror", - "tokio", + "tokio 0.2.22", "vm-genesis", "vm-validator", ] @@ -1253,12 +1259,12 @@ name = "debug-interface" version = "0.1.0" dependencies = [ "anyhow", - "bytes", + "bytes 0.5.6", "libra-logger", "libra-metrics", "libra-workspace-hack", "reqwest", - "tokio", + "tokio 0.2.22", "warp", ] @@ -2097,7 +2103,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", @@ -2105,8 +2111,8 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", - "tokio-util", + "tokio 0.2.22", + "tokio-util 0.3.1", "tracing", "tracing-futures", ] @@ -2145,7 +2151,7 @@ checksum = "ed18eb2459bf1a09ad2d6b1547840c3e5e62882fa09b9a6a20b1de8e3228848f" dependencies = [ "base64 0.12.3", "bitflags", - "bytes", + "bytes 0.5.6", "headers-core", "http", "mime", @@ -2233,7 +2239,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", ] @@ -2244,7 +2250,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ - "bytes", + "bytes 0.5.6", "http", ] @@ -2281,7 +2287,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", @@ -2293,7 +2299,7 @@ dependencies = [ "itoa", "pin-project 1.0.1", "socket2", - "tokio", + "tokio 0.2.22", "tower-service", "tracing", "want", @@ -2305,10 +2311,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", ] @@ -2372,7 +2378,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" dependencies = [ - "bytes", + "bytes 0.5.6", ] [[package]] @@ -2536,7 +2542,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", @@ -2567,7 +2573,7 @@ checksum = "f4f52dbe2c0e7ca54e43f1bc7b77b916750e63d7694e5a18c09b11307acc6b9d" dependencies = [ "Inflector", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "chrono", "dirs 3.0.1", "either", @@ -2585,7 +2591,7 @@ dependencies = [ "static_assertions", "thiserror", "time 0.2.22", - "tokio", + "tokio 0.2.22", "url", ] @@ -2761,7 +2767,7 @@ dependencies = [ "anyhow", "bitvec", "byteorder", - "bytes", + "bytes 0.5.6", "criterion", "curve25519-dalek 3.0.0 (git+https://github.com/novifinancial/curve25519-dalek.git?branch=fiat3)", "curve25519-dalek 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2852,7 +2858,7 @@ dependencies = [ "libra-workspace-hack", "reqwest", "structopt 0.3.20", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -2877,7 +2883,7 @@ dependencies = [ "serde_json", "structopt 0.3.20", "tempfile", - "tokio", + "tokio 0.2.22", "transaction-builder-generated", "warp", ] @@ -3054,7 +3060,7 @@ dependencies = [ "serde", "serde_json", "storage-interface", - "tokio", + "tokio 0.2.22", "transaction-builder-generated", "vm-genesis", "vm-validator", @@ -3076,7 +3082,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "tokio", + "tokio 0.2.22", "warp", ] @@ -3128,7 +3134,7 @@ dependencies = [ "serde", "storage-interface", "thiserror", - "tokio", + "tokio 0.2.22", "transaction-builder-generated", "vm-validator", ] @@ -3216,7 +3222,7 @@ dependencies = [ "storage-interface", "storage-service", "subscription-service", - "tokio", + "tokio 0.2.22", "vm-validator", ] @@ -3235,7 +3241,7 @@ dependencies = [ "prometheus", "rusty-fork", "serde_json", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -3325,7 +3331,7 @@ dependencies = [ "storage-service", "structopt 0.3.20", "subscription-service", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -3371,7 +3377,7 @@ version = "0.1.0" dependencies = [ "libra-logger", "libra-workspace-hack", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -3395,7 +3401,7 @@ dependencies = [ "serde_json", "storage-interface", "thiserror", - "tokio", + "tokio 0.2.22", "ureq", "vm-validator", ] @@ -3521,7 +3527,7 @@ dependencies = [ "serde", "serde_json", "structopt 0.3.20", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -3555,7 +3561,7 @@ name = "libra-types" version = "0.1.0" dependencies = [ "anyhow", - "bytes", + "bytes 0.5.6", "chrono", "hex", "itertools 0.9.0", @@ -3667,7 +3673,7 @@ dependencies = [ name = "libra-workspace-hack" version = "0.1.0" dependencies = [ - "bytes", + "bytes 0.5.6", "cc", "log", "memchr", @@ -3842,7 +3848,7 @@ dependencies = [ name = "memsocket" version = "0.1.0" dependencies = [ - "bytes", + "bytes 0.5.6", "futures 0.3.8", "libra-infallible", "libra-workspace-hack", @@ -4134,7 +4140,7 @@ dependencies = [ "simplelog", "spec-lang", "test-utils", - "tokio", + "tokio 0.2.22", "toml", "vm", ] @@ -4282,7 +4288,7 @@ dependencies = [ name = "netcore" version = "0.1.0" dependencies = [ - "bytes", + "bytes 0.5.6", "futures 0.3.8", "libra-logger", "libra-network-address", @@ -4291,7 +4297,7 @@ dependencies = [ "memsocket", "pin-project 0.4.27", "serde", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -4299,7 +4305,7 @@ name = "network" version = "0.1.0" dependencies = [ "anyhow", - "bytes", + "bytes 0.5.6", "channel", "criterion", "futures 0.3.8", @@ -4333,9 +4339,9 @@ dependencies = [ "short-hex-str", "socket-bench-server", "thiserror", - "tokio", + "tokio 0.2.22", "tokio-retry", - "tokio-util", + "tokio-util 0.5.0", ] [[package]] @@ -4361,7 +4367,7 @@ dependencies = [ "rand 0.7.3", "serde", "subscription-service", - "tokio", + "tokio 0.2.22", "tokio-retry", ] @@ -4385,7 +4391,7 @@ dependencies = [ "network", "once_cell", "subscription-service", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -5015,7 +5021,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", ] @@ -5025,7 +5031,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", @@ -5056,7 +5062,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa" dependencies = [ - "bytes", + "bytes 0.5.6", "prost", ] @@ -5429,7 +5435,7 @@ checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e" dependencies = [ "async-compression", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "encoding_rs", "futures-core", "futures-util", @@ -5449,7 +5455,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "tokio", + "tokio 0.2.22", "tokio-tls", "url", "wasm-bindgen", @@ -5506,7 +5512,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", @@ -5521,7 +5527,7 @@ checksum = "e977941ee0658df96fca7291ecc6fc9a754600b21ad84b959eb1dbbc9d5abcc7" dependencies = [ "async-trait", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "crc32fast", "futures 0.3.8", "http", @@ -5537,7 +5543,7 @@ dependencies = [ "rustc_version", "serde", "serde_json", - "tokio", + "tokio 0.2.22", "xml-rs", ] @@ -5557,7 +5563,7 @@ dependencies = [ "serde", "serde_json", "shlex", - "tokio", + "tokio 0.2.22", "zeroize", ] @@ -5568,7 +5574,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", @@ -5581,7 +5587,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", @@ -5596,7 +5602,7 @@ dependencies = [ "serde", "sha2", "time 0.2.22", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -5606,7 +5612,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", @@ -6160,7 +6166,7 @@ dependencies = [ "regex", "rust_decimal", "statistical", - "tokio", + "tokio 0.2.22", "transaction-builder", ] @@ -6180,8 +6186,8 @@ dependencies = [ "network", "network-builder", "rand 0.7.3", - "tokio", - "tokio-util", + "tokio 0.2.22", + "tokio-util 0.5.0", ] [[package]] @@ -6241,7 +6247,7 @@ name = "state-synchronizer" version = "0.1.0" dependencies = [ "anyhow", - "bytes", + "bytes 0.5.6", "channel", "compiled-stdlib", "executor", @@ -6276,7 +6282,7 @@ dependencies = [ "storage-interface", "storage-service", "subscription-service", - "tokio", + "tokio 0.2.22", "transaction-builder", "vm-genesis", ] @@ -6428,7 +6434,7 @@ dependencies = [ "rand 0.7.3", "storage-client", "storage-interface", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -6792,7 +6798,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", @@ -6810,6 +6816,17 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "tokio" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ca08accbcb46f11fd8d2d1c6158c348b7888009a1f39260bcad66f6a454250" +dependencies = [ + "autocfg 1.0.1", + "futures-core", + "pin-project-lite", +] + [[package]] name = "tokio-executor" version = "0.1.10" @@ -6861,7 +6878,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -6873,7 +6890,7 @@ dependencies = [ "futures-util", "log", "pin-project 0.4.27", - "tokio", + "tokio 0.2.22", "tungstenite", ] @@ -6883,13 +6900,27 @@ 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-sink", + "log", + "pin-project-lite", + "tokio 0.2.22", +] + +[[package]] +name = "tokio-util" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73af76301319bcacf00d26d3c75534ef248dcad7ceaf36d93ec902453c3b1706" +dependencies = [ + "bytes 0.6.0", "futures-core", "futures-io", "futures-sink", "log", "pin-project-lite", - "tokio", + "tokio 0.3.3", ] [[package]] @@ -7011,7 +7042,7 @@ checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" dependencies = [ "base64 0.12.3", "byteorder", - "bytes", + "bytes 0.5.6", "http", "httparse", "input_buffer", @@ -7286,7 +7317,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", @@ -7300,7 +7331,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "tokio", + "tokio 0.2.22", "tokio-tungstenite", "tower-service", "tracing", diff --git a/network/Cargo.toml b/network/Cargo.toml index 7b7d5dd29133..2d80940aa724 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.5.0", features = ["codec"] } bitvec = { path = "../common/bitvec", version = "0.1.0", package = "libra-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 4b790223b3ed..ff9cd8acc9b3 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.5.0", features = ["codec"] } libra-crypto = { path = "../../crypto/crypto" } libra-config = { path = "../../config" } diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml index daa6b240bb9a..acea44a09e5a 100644 --- a/storage/backup/backup-cli/Cargo.toml +++ b/storage/backup/backup-cli/Cargo.toml @@ -27,7 +27,7 @@ serde_json = "1.0.59" structopt = "0.3.20" toml = "0.5.7" tokio = { version = "0.2.22", features = ["full"] } -tokio-util = { version = "0.3.1", features = ["compat"] } +tokio-util = { version = "0.5.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 }