From 20a9bbb1fe47fcd62fcd64b2fa32456b4f434aaf Mon Sep 17 00:00:00 2001 From: Andreas Doerr Date: Thu, 2 Sep 2021 20:50:27 +0200 Subject: [PATCH] Use coherent prost crate versions (#9676) --- Cargo.lock | 99 +++++--------------- client/authority-discovery/Cargo.toml | 2 +- client/finality-grandpa-warp-sync/Cargo.toml | 2 +- client/network/Cargo.toml | 2 +- 4 files changed, 27 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a613b7ba03686..f39254761dcc5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3282,8 +3282,8 @@ dependencies = [ "multistream-select", "parking_lot 0.11.1", "pin-project 1.0.5", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "rand 0.7.3", "ring", "rw-stream-sink", @@ -3332,8 +3332,8 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log 0.4.14", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "rand 0.7.3", "smallvec 1.6.1", ] @@ -3354,8 +3354,8 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log 0.4.14", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "rand 0.7.3", "regex", "sha2 0.9.3", @@ -3374,8 +3374,8 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log 0.4.14", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "smallvec 1.6.1", "wasm-timer", ] @@ -3395,8 +3395,8 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log 0.4.14", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "rand 0.7.3", "sha2 0.9.3", "smallvec 1.6.1", @@ -3457,8 +3457,8 @@ dependencies = [ "lazy_static", "libp2p-core", "log 0.4.14", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "rand 0.8.4", "sha2 0.9.3", "snow", @@ -3493,8 +3493,8 @@ dependencies = [ "futures 0.3.16", "libp2p-core", "log 0.4.14", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "unsigned-varint 0.7.0", "void", ] @@ -3527,8 +3527,8 @@ dependencies = [ "libp2p-swarm", "log 0.4.14", "pin-project 1.0.5", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "rand 0.7.3", "smallvec 1.6.1", "unsigned-varint 0.7.0", @@ -6477,16 +6477,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "prost" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2" -dependencies = [ - "bytes 1.0.1", - "prost-derive 0.7.0", -] - [[package]] name = "prost" version = "0.8.0" @@ -6494,25 +6484,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" dependencies = [ "bytes 1.0.1", - "prost-derive 0.8.0", -] - -[[package]] -name = "prost-build" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3" -dependencies = [ - "bytes 1.0.1", - "heck", - "itertools 0.9.0", - "log 0.4.14", - "multimap", - "petgraph", - "prost 0.7.0", - "prost-types 0.7.0", - "tempfile", - "which", + "prost-derive", ] [[package]] @@ -6527,25 +6499,12 @@ dependencies = [ "log 0.4.14", "multimap", "petgraph", - "prost 0.8.0", - "prost-types 0.8.0", + "prost", + "prost-types", "tempfile", "which", ] -[[package]] -name = "prost-derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4" -dependencies = [ - "anyhow", - "itertools 0.9.0", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "prost-derive" version = "0.8.0" @@ -6559,16 +6518,6 @@ dependencies = [ "syn", ] -[[package]] -name = "prost-types" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb" -dependencies = [ - "bytes 1.0.1", - "prost 0.7.0", -] - [[package]] name = "prost-types" version = "0.8.0" @@ -6576,7 +6525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" dependencies = [ "bytes 1.0.1", - "prost 0.8.0", + "prost", ] [[package]] @@ -7258,8 +7207,8 @@ dependencies = [ "libp2p", "log 0.4.14", "parity-scale-codec", - "prost 0.8.0", - "prost-build 0.7.0", + "prost", + "prost-build", "quickcheck", "rand 0.7.3", "sc-client-api", @@ -7923,8 +7872,8 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.11.1", "pin-project 1.0.5", - "prost 0.8.0", - "prost-build 0.7.0", + "prost", + "prost-build", "quickcheck", "rand 0.7.3", "sc-block-builder", diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml index 8625fa3eb2e08..8d5ed20730f0c 100644 --- a/client/authority-discovery/Cargo.toml +++ b/client/authority-discovery/Cargo.toml @@ -14,7 +14,7 @@ readme = "README.md" targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -prost-build = "0.7" +prost-build = "0.8" [dependencies] async-trait = "0.1" diff --git a/client/finality-grandpa-warp-sync/Cargo.toml b/client/finality-grandpa-warp-sync/Cargo.toml index a1caee4ee74b5..6bb00b936574c 100644 --- a/client/finality-grandpa-warp-sync/Cargo.toml +++ b/client/finality-grandpa-warp-sync/Cargo.toml @@ -16,7 +16,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0" } derive_more = "0.99.11" futures = "0.3.8" log = "0.4.11" -prost = "0.7" +prost = "0.8" sc-client-api = { version = "4.0.0-dev", path = "../api" } sc-finality-grandpa = { version = "0.10.0-dev", path = "../finality-grandpa" } sc-network = { version = "0.10.0-dev", path = "../network" } diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml index 34c2b6972eecd..69217453073df 100644 --- a/client/network/Cargo.toml +++ b/client/network/Cargo.toml @@ -14,7 +14,7 @@ readme = "README.md" targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -prost-build = "0.7" +prost-build = "0.8" [dependencies] async-trait = "0.1"