diff --git a/Cargo.lock b/Cargo.lock index 56239f59258e..3ea85d0352f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -184,7 +184,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b72c1f1154e234325b50864a349b9c8e56939e266a4c307c0f159812df2f9537" dependencies = [ - "bytes", + "bytes 0.5.6", "flate2", "futures-core", "memchr", @@ -249,7 +249,7 @@ dependencies = [ "backup-service", "bcs", "byteorder", - "bytes", + "bytes 1.2.1", "diem-config", "diem-crypto", "diem-infallible", @@ -290,7 +290,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 1.2.1", "diem-config", "diem-crypto", "diem-logger", @@ -583,6 +583,12 @@ name = "bytes" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + +[[package]] +name = "bytes" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" dependencies = [ "serde", ] @@ -912,7 +918,7 @@ dependencies = [ "async-trait", "bcs", "byteorder", - "bytes", + "bytes 1.2.1", "channel", "consensus-types", "diem-config", @@ -1278,7 +1284,7 @@ name = "debug-interface" version = "0.1.0" dependencies = [ "anyhow", - "bytes", + "bytes 1.2.1", "diem-logger", "diem-metrics", "diem-workspace-hack", @@ -1358,7 +1364,7 @@ dependencies = [ "bcs", "bitvec", "byteorder", - "bytes", + "bytes 1.2.1", "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)", @@ -2170,7 +2176,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 1.2.1", "chrono", "diem-crypto", "diem-crypto-derive", @@ -2283,7 +2289,7 @@ name = "diem-workspace-hack" version = "0.1.0" dependencies = [ "byteorder", - "bytes", + "bytes 1.2.1", "cc", "chrono", "itertools 0.9.0", @@ -3216,7 +3222,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", @@ -3264,7 +3270,7 @@ checksum = "ed18eb2459bf1a09ad2d6b1547840c3e5e62882fa09b9a6a20b1de8e3228848f" dependencies = [ "base64 0.12.3", "bitflags", - "bytes", + "bytes 0.5.6", "headers-core", "http", "mime", @@ -3352,7 +3358,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "itoa", ] @@ -3363,7 +3369,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ - "bytes", + "bytes 0.5.6", "http", ] @@ -3400,7 +3406,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", @@ -3424,7 +3430,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 0.2.22", @@ -3491,7 +3497,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" dependencies = [ - "bytes", + "bytes 0.5.6", ] [[package]] @@ -3668,7 +3674,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcaa8ea719de24e21fe6fddb2ea996ca4e312d467c119f827551c4768d97dc5c" dependencies = [ "base64 0.13.0", - "bytes", + "bytes 0.5.6", "chrono", "serde", "serde-value", @@ -3699,7 +3705,7 @@ checksum = "6585da8efec1a3b5df0fb12b357e2f3921cd7436a6d10f1ea06377d4cbd85032" dependencies = [ "Inflector", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "chrono", "dirs-next", "either", @@ -3924,7 +3930,7 @@ dependencies = [ name = "memsocket" version = "0.1.0" dependencies = [ - "bytes", + "bytes 1.2.1", "diem-infallible", "diem-workspace-hack", "futures 0.3.8", @@ -4398,7 +4404,7 @@ dependencies = [ name = "netcore" version = "0.1.0" dependencies = [ - "bytes", + "bytes 1.2.1", "diem-logger", "diem-network-address", "diem-types", @@ -4418,7 +4424,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 1.2.1", "channel", "criterion", "diem-bitvec", @@ -5126,7 +5132,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", ] @@ -5136,7 +5142,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", @@ -5167,7 +5173,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa" dependencies = [ - "bytes", + "bytes 0.5.6", "prost", ] @@ -5548,7 +5554,7 @@ checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" dependencies = [ "async-compression", "base64 0.13.0", - "bytes", + "bytes 0.5.6", "encoding_rs", "futures-core", "futures-util", @@ -5625,7 +5631,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", @@ -5640,7 +5646,7 @@ checksum = "e977941ee0658df96fca7291ecc6fc9a754600b21ad84b959eb1dbbc9d5abcc7" dependencies = [ "async-trait", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "crc32fast", "futures 0.3.8", "http", @@ -5687,7 +5693,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", @@ -5700,7 +5706,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", @@ -5725,7 +5731,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", @@ -6405,7 +6411,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 1.2.1", "channel", "compiled-stdlib", "diem-config", @@ -6979,7 +6985,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", @@ -7047,7 +7053,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edc5a2b13a713b9134debc9aa1265b0a1ccf6a81fa05af2ba26e4aee56cdf1a" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-core", "tokio 0.3.6", ] @@ -7093,7 +7099,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", @@ -7221,7 +7227,7 @@ checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" dependencies = [ "base64 0.12.3", "byteorder", - "bytes", + "bytes 0.5.6", "http", "httparse", "input_buffer", @@ -7496,7 +7502,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 58f70a121f92..ebc17f79ac84 100644 --- a/common/debug-interface/Cargo.toml +++ b/common/debug-interface/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] anyhow = "1.0.36" -bytes = "0.5.6" +bytes = "1.2.1" tokio = { version = "0.2.22", features = ["full"] } reqwest = { version = "0.10.10", 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 c29744c7aabf..2db702a1287e 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.2.1", 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 8e16bb239c1a..3aa244cb45e6 100644 --- a/consensus/Cargo.toml +++ b/consensus/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" anyhow = "1.0.36" async-trait = "0.1.42" byteorder = { version = "1.3.4", default-features = false } -bytes = "0.5.6" +bytes = "1.2.1" 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 df29d1bde45c..90acbfa70a38 100644 --- a/crypto/crypto/Cargo.toml +++ b/crypto/crypto/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] anyhow = "1.0.36" -bytes = "0.5.6" +bytes = "1.2.1" 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 29b6e8894291..1fef56b8c206 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] anyhow = "1.0.36" -bytes = { version = "0.5.6", features = ["serde"] } +bytes = { version = "1.2.1", 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..fcb50aa6e2ff 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.2.1" 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 cc318f805f81..6eedd4dbaeac 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.2.1" 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 0f7b0b070c2f..f2e00011802a 100644 --- a/state-synchronizer/Cargo.toml +++ b/state-synchronizer/Cargo.toml @@ -43,7 +43,7 @@ bcs = "0.1.2" vm-genesis = { path = "../language/tools/vm-genesis", version = "0.1.0", optional = true } [dev-dependencies] -bytes = "0.5.6" +bytes = "1.2.1" 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 8052425d1c83..885072726a9a 100644 --- a/storage/backup/backup-cli/Cargo.toml +++ b/storage/backup/backup-cli/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" anyhow = "1.0.36" async-trait = "0.1.42" byteorder = "1.3.4" -bytes = "0.5.6" +bytes = "1.2.1" 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 806fa96ff832..784c6ab0d058 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.36" -bytes = "0.5.6" +bytes = "1.2.1" futures = "0.3.8" hyper = "0.13.9" once_cell = "1.4.1" diff --git a/types/Cargo.toml b/types/Cargo.toml index a57729c27d59..2a3cd137cedf 100644 --- a/types/Cargo.toml +++ b/types/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] anyhow = "1.0.36" -bytes = "0.5.6" +bytes = "1.2.1" chrono = { version = "0.4.19", default-features = false, features = ["clock"] } hex = "0.4.2" itertools = { version = "0.9.0", default-features = false }