Bump rust from 1.45.2 to 1.46.0 and update dependencies (exonum#1894)

peerforce · Sep 22, 2020 · d7ed0a7 · d7ed0a7
1 parent a8b1b35
commit d7ed0a7
Show file tree

Hide file tree

Showing 26 changed files with 109 additions and 99 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -41,7 +41,7 @@ addons:
     - zlib1g-dev
 
 rust:
-  - 1.45.2
+  - 1.46.0
 
 cache:
   npm: true

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 [![Docs.rs](https://docs.rs/exonum/badge.svg)](https://docs.rs/exonum)
 [![License: Apache-2.0](https://img.shields.io/github/license/exonum/exonum.svg)](LICENSE.md)
 [![LoC](https://tokei.rs/b1/github/exonum/exonum)](https://github.com/exonum/exonum)
-![rust 1.45.0+ required](https://img.shields.io/badge/rust-1.45.0+-blue.svg?label=Required%20Rust)
+![rust 1.46.0+ required](https://img.shields.io/badge/rust-1.46.0+-blue.svg?label=Required%20Rust)
 
 **Community:**
 [![Join the chat at https://gitter.im/exonum/exonum](https://img.shields.io/gitter/room/exonum/exonum.svg?label=Chat)](https://gitter.im/exonum/exonum)

diff --git a/components/api/Cargo.toml b/components/api/Cargo.toml
@@ -16,15 +16,15 @@ description = "HTTP API engine of the Exonum framework"
 travis-ci = { repository = "exonum/exonum" }
 
 [dependencies]
-actix-cors = "0.2.0"
-actix-rt = "1.0.0"
-actix-web = { version = "2.0.0", default-features = false }
-anyhow = "1.0.26"
-chrono = { version = "0.4.10", features = ["serde"] }
-futures = "0.3.4"
-log = "0.4.8"
-serde = { version = "1.0.104", features = ["derive"] }
-serde_json = "1.0.48"
+actix-cors = "0.3.0"
+actix-rt = "1.1"
+actix-web = { version = "3.0.2", default-features = false }
+anyhow = "1.0"
+chrono = { version = "0.4.15", features = ["serde"] }
+futures = "0.3.5"
+log = "0.4.11"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
 serde_urlencoded = "0.7.0"
 thiserror = "1.0"
 

diff --git a/components/build/Cargo.toml b/components/build/Cargo.toml
@@ -13,8 +13,8 @@ categories = ["development-tools"]
 description = "Helper functions for writing build.rs for exonum services."
 
 [dependencies]
-protoc-rust = "2.14.0"
-walkdir = "2.3.1"
+protoc-rust = "2.17"
+walkdir = "2.3"
 syn = "1.0"
 quote = "1.0"
 proc-macro2 = "1.0"
diff --git a/components/crypto/Cargo.toml b/components/crypto/Cargo.toml
@@ -15,15 +15,15 @@ links = "exonum_protobuf_crypto"
 
 [dependencies]
 anyhow = "1.0.26"
-hex = "0.4.0"
-serde = "1.0.101"
-serde_derive = "1.0.101"
+hex = "0.4.2"
+serde = "1.0"
+serde_derive = "1.0"
 exonum_sodiumoxide = { version = "0.0.23", optional = true }
 exonum-proto = { path = "../proto", version = "1.0.0", optional = true }
 protobuf = { version = "2.17.0", features = ["with-serde"], optional = true }
 
 [dev-dependencies]
-serde_json = "1.0.44"
+serde_json = "1.0"
 tempdir = "0.3.7"
 
 [features]

diff --git a/components/explorer/Cargo.toml b/components/explorer/Cargo.toml
@@ -19,7 +19,7 @@ travis-ci = { repository = "exonum/exonum" }
 exonum = { version = "1.0.0", path = "../../exonum" }
 
 chrono = { version = "0.4.6", features = ["serde"] }
-hex = "0.4.0"
+hex = "0.4.2"
 serde = "1.0"
 serde_derive = "1.0"
 
@@ -28,5 +28,5 @@ exonum-derive = { version = "1.0.0", path = "../derive" }
 exonum-merkledb = { version = "1.0.0", path = "../merkledb" }
 exonum-rust-runtime = { version = "1.0.0", path = "../../runtimes/rust" }
 
-bincode = "1.2.1"
+bincode = "1.3"
 serde_json = "1.0"
diff --git a/components/keys/Cargo.toml b/components/keys/Cargo.toml
@@ -20,12 +20,12 @@ secret-tree = "0.2.0"
 serde = "1.0"
 serde_derive = "1.0"
 structopt = "0.3"
-toml = "0.5.0"
+toml = "0.5"
 
 exonum-crypto = { version = "1.0.0", path = "../crypto" }
 
 [dev-dependencies]
-hex = "0.4.0"
+hex = "0.4.2"
 serde_json = "1.0"
 tempdir = "0.3.7"
 

diff --git a/components/merkledb/Cargo.toml b/components/merkledb/Cargo.toml
@@ -18,7 +18,7 @@ description = "Persistent storage implementation based on RocksDB which provides
 exonum-crypto = { path = "../crypto", version = "1.0.0", features = ["with-serde"]}
 exonum-proto = { path = "../proto", version = "1.0.0", optional = true }
 
-anyhow = "1.0.26"
+anyhow = "1.0"
 byteorder = "1.3"
 chrono = "0.4.6"
 crossbeam = "0.7.3"
@@ -38,8 +38,8 @@ uuid = { version = "0.8", features = ["v4"] }
 [dev-dependencies]
 exonum-derive = { version = "1.0.0", path = "../derive" }
 
-assert_matches = "1.3.0"
-bincode = "1.1"
+assert_matches = "1.3"
+bincode = "1.3"
 criterion = "0.3"
 hex = "0.4.0"
 modifier = "0.1"
@@ -48,7 +48,7 @@ pretty_assertions = "0.6"
 rand = "0.7"
 rand_xorshift = "0.2.0"
 serde_json = "1.0"
-url = "2.0.0"
+url = "2.0"
 
 [[bench]]
 name = "criterion"

diff --git a/components/proto/Cargo.toml b/components/proto/Cargo.toml
@@ -15,19 +15,19 @@ links = "exonum_protobuf_common"
 
 [dependencies]
 anyhow = "1.0"
-base64 = "0.12.0"
-base64-serde = "0.5.0"
+base64 = "0.12"
+base64-serde = "0.5"
 chrono = { version = "0.4.6", features = ["serde"] }
 protobuf = { version = "2.17.0", features = ["with-serde"] }
 bit-vec = "0.6.1"
-serde = "1.0.101"
-serde_derive = "1.0.101"
+serde = "1.0"
+serde_derive = "1.0"
 exonum-derive = { path = "../derive", version = "1.0.0"}
 protobuf-convert = "0.4.0"
 
 [dev-dependencies]
 rand = "0.7.3"
-serde_json = "1.0.48"
+serde_json = "1.0"
 
 [features]
 default = ["with-serde"]

diff --git a/components/system-api/Cargo.toml b/components/system-api/Cargo.toml
@@ -20,7 +20,7 @@ exonum = { version = "1.0.0", path = "../../exonum" }
 exonum-api = { version = "1.0.0", path = "../api" }
 exonum-node = { version = "1.0.0", path = "../../exonum-node" }
 
-actix-web = { version = "2.0.0", default-features = false }
+actix-web = { version = "3.0.2", default-features = false }
 futures = "0.3.4"
 semver = "0.10.0"
 serde = "1.0"
@@ -29,9 +29,9 @@ serde_derive = "1.0"
 [dev-dependencies]
 exonum-testkit = { version = "1.0.0", path = "../../test-suite/testkit", features = ["exonum-node"] }
 
-anyhow = "1.0.26"
+anyhow = "1.0"
 pretty_assertions = "0.6.1"
 
 [dev-dependencies.tokio]
-version = "0.2.13"
+version = "0.2.22"
 features = ["blocking", "dns", "io-util", "macros", "rt-threaded", "tcp", "time"]
diff --git a/examples/cryptocurrency-advanced/backend/Cargo.toml b/examples/cryptocurrency-advanced/backend/Cargo.toml
@@ -23,13 +23,13 @@ exonum-proto = { version = "1.0.0", path = "../../../components/proto" }
 exonum-cli = { version = "1.0.0", path = "../../../cli" }
 exonum-rust-runtime = { version = "1.0.0", path = "../../../runtimes/rust" }
 
-anyhow = "1.0.26"
+anyhow = "1.0"
 protobuf = "2.17.0"
-serde = "1.0.0"
-serde_derive = "1.0.0"
+serde = "1.0"
+serde_derive = "1.0"
 
 [dependencies.tokio]
-version = "0.2.13"
+version = "0.2.22"
 features = ["blocking", "dns", "io-util", "macros", "rt-threaded", "tcp", "time"]
 
 # Previous version of cryptocurrency.
@@ -43,12 +43,12 @@ exonum-explorer-service = { version = "1.0.0", path = "../../../services/explore
 exonum-supervisor = { version = "1.0.0", path = "../../../services/supervisor" }
 exonum-testkit = { version = "1.0.0", path = "../../../test-suite/testkit" }
 
-assert_matches = "1.2.0"
-bincode = "1.2.1"
-hex = "0.4.0"
+assert_matches = "1.2"
+bincode = "1.3"
+hex = "0.4"
 pretty_assertions = "0.6.1"
-rand = "0.7.0"
-serde_json = "1.0.0"
+rand = "0.7"
+serde_json = "1.0"
 
 [build-dependencies]
 exonum-build = { version = "1.0.1", path = "../../../components/build" }

diff --git a/examples/cryptocurrency/Cargo.toml b/examples/cryptocurrency/Cargo.toml
@@ -24,7 +24,7 @@ exonum-merkledb = { version = "1.0.0", path = "../../components/merkledb" }
 exonum-proto = { version = "1.0.0", path = "../../components/proto" }
 exonum-rust-runtime = { version = "1.0.0", path = "../../runtimes/rust" }
 
-anyhow = "1.0.26"
+anyhow = "1.0"
 protobuf = "2.17.0"
 serde = "1.0"
 serde_derive = "1.0"

diff --git a/examples/sample_runtime/Cargo.toml b/examples/sample_runtime/Cargo.toml
@@ -22,5 +22,5 @@ exonum-rust-runtime = { version = "1.0.0", path = "../../runtimes/rust" }
 futures = "0.3.4"
 
 [dependencies.tokio]
-version = "0.2.13"
+version = "0.2.22"
 features = ["blocking", "dns", "io-util", "macros", "rt-threaded", "tcp", "time"]
diff --git a/examples/timestamping/backend/Cargo.toml b/examples/timestamping/backend/Cargo.toml
@@ -21,16 +21,16 @@ exonum-rust-runtime = { version = "1.0.0", path = "../../../runtimes/rust" }
 exonum-supervisor = { version = "1.0.0", path = "../../../services/supervisor" }
 exonum-time = { version = "1.0.0", path = "../../../services/time" }
 
-anyhow = "1.0.26"
+anyhow = "1.0"
 chrono = { version = "0.4.6", features = ["serde"] }
 log = "0.4.6"
 protobuf = "2.17.0"
-serde = "1.0.10"
-serde_derive = "1.0.10"
-serde_json = "1.0.2"
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = "1.0"
 
 [dependencies.tokio]
-version = "0.2.13"
+version = "0.2.22"
 features = ["blocking", "dns", "io-util", "macros", "rt-threaded", "tcp", "time"]
 
 [dev-dependencies]

diff --git a/exonum-node/Cargo.toml b/exonum-node/Cargo.toml
@@ -16,20 +16,20 @@ description = "Node of the Exonum blockchain framework."
 travis-ci = { repository = "exonum/exonum" }
 
 [dependencies]
-anyhow = "1.0.26"
-actix-rt = "1.0.0"
-async-trait = "0.1.24"
-bit-vec = "0.6.0"
-byteorder = { version = "1.2.7", features = ["i128"] }
-bytes = "0.5.0"
+anyhow = "1.0"
+actix-rt = "1.1"
+async-trait = "0.1"
+bit-vec = "0.6"
+byteorder = { version = "1.3", features = ["i128"] }
+bytes = "0.5"
 chrono = "0.4.6"
 futures = "0.3.4"
-futures-retry = "0.5.0"
+futures-retry = "0.5"
 log = "0.4.6"
 protobuf = { version = "2.17.0", features = ["with-serde"] }
 rand = "0.7"
-serde = "1.0.101"
-serde_derive = "1.0.101"
+serde = "1.0"
+serde_derive = "1.0"
 snow = { version = "0.7.0", default-features = false }
 thiserror = "1.0"
 tokio-util = { version = "0.3.0", features = ["codec"] }
@@ -42,15 +42,15 @@ exonum-proto = { version = "1.0.0", path = "../components/proto" }
 exonum_sodiumoxide = { version = "0.0.23", optional = true }
 
 [dependencies.tokio]
-version = "0.2.13"
+version = "0.2.22"
 features = ["blocking", "dns", "io-util", "macros", "rt-threaded", "signal", "tcp", "time"]
 
 [dev-dependencies]
-bincode = "1.2.1"
+bincode = "1.3"
 criterion = "0.3.0"
-hex = "0.4.0"
+hex = "0.4"
 pretty_assertions = "0.6.1"
-serde_json = "1.0.44"
+serde_json = "1.0"
 toml = "0.5.6"
 
 exonum-rust-runtime = { version = "1.0.0", path = "../runtimes/rust" }

diff --git a/exonum-node/src/state.rs b/exonum-node/src/state.rs
@@ -30,6 +30,7 @@ use exonum::{
 use log::{error, trace};
 
 use std::{
+    cmp::Reverse,
     collections::{hash_map::Entry, BTreeMap, HashMap, HashSet},
     sync::{Arc, RwLock},
     time::{Duration, SystemTime},
@@ -771,7 +772,7 @@ impl State {
         }
 
         let mut rounds: Vec<_> = self.validators_rounds.iter().map(|(_, v)| v).collect();
-        rounds.sort_unstable_by(|a, b| b.cmp(a));
+        rounds.sort_unstable_by_key(|&r| Reverse(r));
 
         if *rounds[max_byzantine_count] > self.round {
             Some(*rounds[max_byzantine_count])

diff --git a/exonum/Cargo.toml b/exonum/Cargo.toml
@@ -25,7 +25,7 @@ serde = "1.0"
 serde_derive = "1.0"
 serde_str = "0.1.0"
 env_logger = "0.7.1"
-futures = "0.3.4"
+futures = "0.3.5"
 os_info = "2.0"
 chrono = { version = "0.4.6", features = ["serde"] }
 protobuf = { version = "2.17.0", features = ["with-serde"] }
@@ -39,13 +39,13 @@ exonum-merkledb = { version = "1.0.0", path = "../components/merkledb" }
 exonum-proto = { version = "1.0.0", path = "../components/proto" }
 
 [dev-dependencies]
-assert_matches = "1.3.0"
-bincode = "1.2.0"
-bit-vec = "0.6.0"
-criterion = "0.3.0"
-pretty_assertions = "0.6.1"
-rand = "0.7.3"
-serde_json = "1.0.19"
+assert_matches = "1.3"
+bincode = "1.3"
+bit-vec = "0.6"
+criterion = "0.3"
+pretty_assertions = "0.6"
+rand = "0.7"
+serde_json = "1.0"
 
 [[bench]]
 name = "criterion"

diff --git a/runtimes/rust/Cargo.toml b/runtimes/rust/Cargo.toml
@@ -22,7 +22,7 @@ exonum-derive = { version = "1.0.0", path = "../../components/derive" }
 exonum-merkledb = { version = "1.0.0", path = "../../components/merkledb" }
 exonum-proto = { version = "1.0.0", path = "../../components/proto" }
 
-actix-web = "2.0.0"
+actix-web = "3.0.2"
 futures = "0.3.5"
 log = "0.4.11"
 protobuf = "2.17.0"
@@ -33,7 +33,7 @@ tokio = "0.2.22"
 [dev-dependencies]
 anyhow = "1.0"
 assert_matches = "1.3"
-bincode = "1.2"
+bincode = "1.3"
 criterion = "0.3.3"
 pretty_assertions = "0.6.1"
 rand = "0.7"

diff --git a/services/explorer/Cargo.toml b/services/explorer/Cargo.toml
@@ -22,17 +22,17 @@ exonum-derive = { version = "1.0.0", path = "../../components/derive" }
 exonum-explorer = { version = "1.0.0", path = "../../components/explorer" }
 exonum-rust-runtime = { version = "1.0.0", path = "../../runtimes/rust" }
 
-actix = { version = "0.9.0", default-features = false }
-actix-web = { version = "2.0.0", default-features = false }
-actix-web-actors = "2.0.0"
-anyhow = "1.0.26"
+actix = { version = "0.10.0", default-features = false }
+actix-web = { version = "3.0.2", default-features = false }
+actix-web-actors = "3.0.0"
+anyhow = "1.0"
 futures = "0.3.4"
 hex = "0.4.0"
 log = "0.4.6"
 rand = "0.7"
 serde = "1.0"
 serde_derive = "1.0"
-serde_json = "1.0.42"
+serde_json = "1.0"
 
 [dev-dependencies]
 exonum-merkledb = { version = "1.0.0", path = "../../components/merkledb" }
@@ -44,5 +44,5 @@ reqwest = { version = "0.10.2", features = ["json"] }
 websocket = { version = "0.26.2", default-features = false, features = ["sync"] }
 
 [dev-dependencies.tokio]
-version = "0.2.13"
+version = "0.2.22"
 features = ["blocking", "dns", "io-util", "macros", "rt-threaded", "tcp", "time"]