Merge branch 'master' into fix-reseal-min-period

Author: sgkim126

Cargo.lock

@@ -33,7 +33,7 @@ memorydb = { path = "../util/memorydb" }
 multimap = { path = "../util/multimap" }
 parking_lot = "0.6.0"
 primitives = { path = "../util/primitives" }
-rand = "0.5.3"
+rand = "0.6.1"
 rlp = { path = "../util/rlp" }
 rlp_compress = { path = "../util/rlp_compress" }
 rlp_derive = { path = "../util/rlp_derive" }

core/Cargo.toml

@@ -32,7 +32,8 @@ use ctypes::util::unexpected::{Mismatch, OutOfBounds};
 use ctypes::BlockNumber;
 use parking_lot::{Mutex, ReentrantMutex, RwLock};
 use primitives::{u256_from_u128, Bytes, H256, U256};
-use rand::{thread_rng, Rng};
+use rand::prelude::SliceRandom;
+use rand::thread_rng;
 use rlp::{Encodable, UntrustedRlp};
 use time::Duration;
 
@@ -996,7 +997,7 @@ impl TendermintExtension {
         let mut count = (peers.len() as f64).powf(0.5).round() as usize;
         count = cmp::min(count, MAX_PEERS_PROPAGATION);
         count = cmp::max(count, MIN_PEERS_PROPAGATION);
-        thread_rng().shuffle(&mut peers);
+        peers.shuffle(&mut thread_rng());
         peers.truncate(count);
         peers
     }

core/src/consensus/tendermint/mod.rs

@@ -10,4 +10,4 @@ rust-crypto = "0.2.36"
 primitives = { path = "../util/primitives" }
 
 [dev-dependencies]
-rand = "0.5.3"
+rand = "0.6.1"

crypto/Cargo.toml

@@ -12,7 +12,7 @@ codechain-timer = { path = "../util/timer" }
 log = "0.4.6"
 parking_lot = "0.6.0"
 primitives = { path = "../util/primitives" }
-rand = "0.5.3"
+rand = "0.6.1"
 rlp = { path = "../util/rlp" }
 time = "0.1"
 

discovery/Cargo.toml

@@ -20,7 +20,8 @@ use std::sync::Arc;
 use cnetwork::{Api, DiscoveryApi, IntoSocketAddr, NetworkExtension, NodeId, RoutingTable};
 use ctimer::{TimeoutHandler, TimerToken};
 use parking_lot::RwLock;
-use rand::{thread_rng, Rng};
+use rand::prelude::SliceRandom;
+use rand::thread_rng;
 use rlp::{Decodable, Encodable, UntrustedRlp};
 use time::Duration;
 
@@ -100,7 +101,7 @@ impl NetworkExtension for Extension {
                 if let (Some(api), Some(routing_table)) = (&*api, &*routing_table) {
                     let mut addresses =
                         routing_table.reachable_addresses(&node.into_addr()).into_iter().collect::<Vec<_>>();
-                    thread_rng().shuffle(&mut addresses);
+                    addresses.shuffle(&mut thread_rng());
                     let addresses =
                         addresses.into_iter().take(::std::cmp::min(self.config.bucket_size, len) as usize).collect();
                     let response = Message::Response(addresses).rlp_bytes();

discovery/src/unstructured/extension.rs

@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["debris <[email protected]>", "CodeChain Team <[email protected]>"]
 
 [dependencies]
-rand = "0.5.3"
+rand = "0.6.1"
 rustc-hex = "1.0"
 rustc-serialize = "0.3"
 lazy_static = "1.2"

key/Cargo.toml

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{Generator, KeyPair, SECP256K1};
-use rand::os::OsRng;
+use rand::rngs::OsRng;
 
 pub struct Random;
 

key/src/random.rs

@@ -6,7 +6,7 @@ authors = ["CodeChain Team <[email protected]>", "Parity Technologies <admin@
 [dependencies]
 log = "0.4.6"
 libc = "0.2"
-rand = "0.5.3"
+rand = "0.6.1"
 codechain-json = { path = "../json" }
 codechain-key = { path = "../key" }
 codechain-types = { path = "../types" }

keystore/Cargo.toml

@@ -15,7 +15,8 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use rand::distributions::Alphanumeric;
-use rand::{OsRng, Rng, RngCore};
+use rand::rngs::OsRng;
+use rand::{Rng, RngCore};
 
 pub trait Random {
     fn random() -> Self