diff --git a/Cargo.lock b/Cargo.lock index ee0de5c7e5c8..c87f0cb07622 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 1.3.0", "diem-config", "diem-crypto", "diem-infallible", @@ -284,7 +284,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 1.3.0", "diem-config", "diem-crypto", "diem-logger", @@ -577,6 +577,12 @@ name = "bytes" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + +[[package]] +name = "bytes" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" dependencies = [ "serde", ] @@ -906,7 +912,7 @@ dependencies = [ "async-trait", "bcs", "byteorder", - "bytes", + "bytes 1.3.0", "channel", "consensus-types", "diem-config", @@ -1276,7 +1282,7 @@ name = "debug-interface" version = "0.1.0" dependencies = [ "anyhow", - "bytes", + "bytes 1.3.0", "diem-logger", "diem-metrics", "diem-workspace-hack", @@ -1356,7 +1362,7 @@ dependencies = [ "bcs", "bitvec", "byteorder", - "bytes", + "bytes 1.3.0", "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)", @@ -2166,7 +2172,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 1.3.0", "chrono", "diem-crypto", "diem-crypto-derive", @@ -2279,7 +2285,7 @@ name = "diem-workspace-hack" version = "0.1.0" dependencies = [ "byteorder", - "bytes", + "bytes 1.3.0", "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", @@ -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", @@ -3408,7 +3414,7 @@ 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", @@ -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", @@ -3894,7 +3900,7 @@ dependencies = [ name = "memsocket" version = "0.1.0" dependencies = [ - "bytes", + "bytes 1.3.0", "diem-infallible", "diem-workspace-hack", "futures 0.3.8", @@ -4366,7 +4372,7 @@ dependencies = [ name = "netcore" version = "0.1.0" dependencies = [ - "bytes", + "bytes 1.3.0", "diem-logger", "diem-network-address", "diem-types", @@ -4385,7 +4391,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 1.3.0", "channel", "criterion", "diem-bitvec", @@ -5093,7 +5099,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 +5109,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 +5140,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 +5513,7 @@ checksum = "fb15d6255c792356a0f578d8a645c677904dc02e862bebe2ecc18e0c01b9a0ce" dependencies = [ "async-compression", "base64 0.13.0", - "bytes", + "bytes 0.5.6", "encoding_rs", "futures-core", "futures-util", @@ -5585,7 +5591,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 +5606,7 @@ checksum = "e977941ee0658df96fca7291ecc6fc9a754600b21ad84b959eb1dbbc9d5abcc7" dependencies = [ "async-trait", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "crc32fast", "futures 0.3.8", "http", @@ -5647,7 +5653,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 +5666,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", @@ -5685,7 +5691,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", @@ -6359,7 +6365,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 1.3.0", "channel", "compiled-stdlib", "diem-config", @@ -6909,7 +6915,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", @@ -7000,7 +7006,7 @@ 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", @@ -7128,7 +7134,7 @@ checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" dependencies = [ "base64 0.12.3", "byteorder", - "bytes", + "bytes 0.5.6", "http", "httparse", "input_buffer", @@ -7403,7 +7409,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", diff --git a/common/debug-interface/Cargo.toml b/common/debug-interface/Cargo.toml index ee634b261cce..01ca0c7a155e 100644 --- a/common/debug-interface/Cargo.toml +++ b/common/debug-interface/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] anyhow = "1.0.34" -bytes = "0.5.6" +bytes = "1.3.0" tokio = { version = "0.2.22", features = ["full"] } reqwest = { version = "0.10.9", features = ["blocking", "json"], default_features = false } warp = "0.2.5" diff --git a/common/workspace-hack/Cargo.toml b/common/workspace-hack/Cargo.toml index 96e4c7d2c78e..00870c720eb2 100644 --- a/common/workspace-hack/Cargo.toml +++ b/common/workspace-hack/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] byteorder = { version = "1.3.4", features = ["i128", "std"] } -bytes = { version = "0.5.6", features = ["serde", "std"] } +bytes = { version = "1.3.0", features = ["serde", "std"] } cc = { version = "1.0.66", features = ["jobserver", "parallel"] } chrono = "0.4.19" itertools = "0.9.0" diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml index d359dc0d2c26..e57c53c83d78 100644 --- a/consensus/Cargo.toml +++ b/consensus/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" anyhow = "1.0.34" async-trait = "0.1.42" byteorder = { version = "1.3.4", default-features = false } -bytes = "0.5.6" +bytes = "1.3.0" fail = "0.4.0" futures = "0.3.8" itertools = { version = "0.9.0", default-features = false } diff --git a/crypto/crypto/Cargo.toml b/crypto/crypto/Cargo.toml index 8e8af1ca73c6..07fea647c600 100644 --- a/crypto/crypto/Cargo.toml +++ b/crypto/crypto/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] anyhow = "1.0.34" -bytes = "0.5.6" +bytes = "1.3.0" vanilla-curve25519-dalek = { version = "3", package = 'curve25519-dalek', default-features = false, features = ["std"], optional = true } curve25519-dalek = { git = "https://github.com/novifinancial/curve25519-dalek.git", branch = "fiat3", version = "3", default-features = false, features = ["std", "fiat_u64_backend"], optional = true } digest = "0.9.0" diff --git a/network/Cargo.toml b/network/Cargo.toml index 1e8922225ce8..c14161a05420 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] anyhow = "1.0.34" -bytes = { version = "0.5.6", features = ["serde"] } +bytes = { version = "1.3.0", features = ["serde"] } futures = "0.3.8" futures-util = "0.3.8" hex = "0.4.2" diff --git a/network/memsocket/Cargo.toml b/network/memsocket/Cargo.toml index 0fae0cb46e29..e25e3e8fefd4 100644 --- a/network/memsocket/Cargo.toml +++ b/network/memsocket/Cargo.toml @@ -11,7 +11,7 @@ publish = false [dependencies] futures = "0.3.8" -bytes = "0.5.6" +bytes = "1.3.0" once_cell = "1.4.1" diem-infallible = { path = "../../common/infallible", version = "0.1.0" } diem-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" } diff --git a/network/netcore/Cargo.toml b/network/netcore/Cargo.toml index 291d2507038d..ede50d8f3899 100644 --- a/network/netcore/Cargo.toml +++ b/network/netcore/Cargo.toml @@ -10,7 +10,7 @@ publish = false edition = "2018" [dependencies] -bytes = "0.5.6" +bytes = "1.3.0" futures = "0.3.8" pin-project = "1.0.2" serde = { version = "1.0.117", default-features = false } diff --git a/state-synchronizer/Cargo.toml b/state-synchronizer/Cargo.toml index 4d312257427d..fbee487b6bf0 100644 --- a/state-synchronizer/Cargo.toml +++ b/state-synchronizer/Cargo.toml @@ -43,7 +43,7 @@ bcs = "0.1.1" vm-genesis = { path = "../language/tools/vm-genesis", version = "0.1.0", optional = true } [dev-dependencies] -bytes = "0.5.6" +bytes = "1.3.0" proptest = "0.10.1" channel = { path = "../common/channel", version = "0.1.0" } diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml index 0881f975ca99..c98f862c18b7 100644 --- a/storage/backup/backup-cli/Cargo.toml +++ b/storage/backup/backup-cli/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" anyhow = "1.0.34" async-trait = "0.1.42" byteorder = "1.3.4" -bytes = "0.5.6" +bytes = "1.3.0" futures = "0.3.8" hex = "0.4.2" itertools = "0.9.0" diff --git a/storage/backup/backup-service/Cargo.toml b/storage/backup/backup-service/Cargo.toml index 0ef45910d40d..c47f5c0ceb97 100644 --- a/storage/backup/backup-service/Cargo.toml +++ b/storage/backup/backup-service/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" [dependencies] anyhow = "1.0.34" -bytes = "0.5.6" +bytes = "1.3.0" futures = "0.3.8" hyper = "0.13.9" once_cell = "1.4.1" diff --git a/types/Cargo.toml b/types/Cargo.toml index adb6d192ea3c..35e8080b50dd 100644 --- a/types/Cargo.toml +++ b/types/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] anyhow = "1.0.34" -bytes = "0.5.6" +bytes = "1.3.0" chrono = { version = "0.4.19", default-features = false, features = ["clock"] } hex = "0.4.2" itertools = { version = "0.9.0", default-features = false }