From 9da0f74112de528c5dd83800363483eaa2b51433 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, 78 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7f1d46f46aa30..0033547593589 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3245,8 +3245,8 @@ dependencies = [ "parity-multiaddr", "parking_lot 0.11.1", "pin-project 1.0.5", - "prost", - "prost-build", + "prost 0.7.0", + "prost-build 0.7.0", "rand 0.7.3", "ring", "rw-stream-sink", @@ -3295,8 +3295,8 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost", - "prost-build", + "prost 0.7.0", + "prost-build 0.7.0", "rand 0.7.3", "smallvec 1.6.1", ] @@ -3317,8 +3317,8 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost", - "prost-build", + "prost 0.7.0", + "prost-build 0.7.0", "rand 0.7.3", "regex", "sha2 0.9.3", @@ -3337,8 +3337,8 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost", - "prost-build", + "prost 0.7.0", + "prost-build 0.7.0", "smallvec 1.6.1", "wasm-timer", ] @@ -3358,8 +3358,8 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost", - "prost-build", + "prost 0.7.0", + "prost-build 0.7.0", "rand 0.7.3", "sha2 0.9.3", "smallvec 1.6.1", @@ -3420,8 +3420,8 @@ dependencies = [ "lazy_static", "libp2p-core", "log", - "prost", - "prost-build", + "prost 0.7.0", + "prost-build 0.7.0", "rand 0.7.3", "sha2 0.9.3", "snow", @@ -3456,8 +3456,8 @@ dependencies = [ "futures 0.3.15", "libp2p-core", "log", - "prost", - "prost-build", + "prost 0.7.0", + "prost-build 0.7.0", "unsigned-varint 0.7.0", "void", ] @@ -3490,8 +3490,8 @@ dependencies = [ "libp2p-swarm", "log", "pin-project 1.0.5", - "prost", - "prost-build", + "prost 0.7.0", + "prost-build 0.7.0", "rand 0.7.3", "smallvec 1.6.1", "unsigned-varint 0.7.0", @@ -6399,7 +6399,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2" dependencies = [ "bytes 1.0.1", - "prost-derive", + "prost-derive 0.7.0", +] + +[[package]] +name = "prost" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" +dependencies = [ + "bytes 1.0.1", + "prost-derive 0.8.0", ] [[package]] @@ -6414,8 +6424,26 @@ dependencies = [ "log", "multimap", "petgraph", - "prost", - "prost-types", + "prost 0.7.0", + "prost-types 0.7.0", + "tempfile", + "which", +] + +[[package]] +name = "prost-build" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603" +dependencies = [ + "bytes 1.0.1", + "heck", + "itertools 0.10.0", + "log", + "multimap", + "petgraph", + "prost 0.8.0", + "prost-types 0.8.0", "tempfile", "which", ] @@ -6433,6 +6461,19 @@ dependencies = [ "syn", ] +[[package]] +name = "prost-derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" +dependencies = [ + "anyhow", + "itertools 0.10.0", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost-types" version = "0.7.0" @@ -6440,7 +6481,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb" dependencies = [ "bytes 1.0.1", - "prost", + "prost 0.7.0", +] + +[[package]] +name = "prost-types" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" +dependencies = [ + "bytes 1.0.1", + "prost 0.8.0", ] [[package]] @@ -7060,8 +7111,8 @@ dependencies = [ "libp2p", "log", "parity-scale-codec", - "prost", - "prost-build", + "prost 0.7.0", + "prost-build 0.8.0", "quickcheck", "rand 0.7.3", "sc-client-api", @@ -7782,8 +7833,8 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.11.1", "pin-project 1.0.5", - "prost", - "prost-build", + "prost 0.7.0", + "prost-build 0.8.0", "quickcheck", "rand 0.7.3", "sc-block-builder", diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml index bca84d18d0885..8a08d7aa2669c 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 62fe596083336..3d240a2a05899 100644 --- a/client/finality-grandpa-warp-sync/Cargo.toml +++ b/client/finality-grandpa-warp-sync/Cargo.toml @@ -18,7 +18,7 @@ futures = "0.3.8" log = "0.4.11" num-traits = "0.2.14" parking_lot = "0.11.1" -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 e7f23e484e5f7..86cb5e308af19 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"