[dependencies] bump rand 0.7

accounts/ethkey/Cargo.toml

@@ -13,7 +13,7 @@ lazy_static = "1.0"
 log = "0.4"
 parity-wordlist = "1.3"
 quick-error = "1.2.2"
-rand = "0.6"
+rand = "0.7"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"

accounts/ethkey/src/random.rs

@@ -21,14 +21,12 @@ use super::{Generator, KeyPair, SECP256K1};
 pub struct Random;
 
 impl Generator for Random {
-	type Error = ::std::io::Error;
+	type Error = std::io::Error;
 
 	fn generate(&mut self) -> Result<KeyPair, Self::Error> {
-		let mut rng = OsRng::new()?;
-		match rng.generate() {
-			Ok(pair) => Ok(pair),
-			Err(void) => match void {}, // LLVM unreachable
-		}
+		Generator::generate(&mut OsRng).map_err(|void| {
+			match void {} // LLVM unreachable
+		})
 	}
 }
 

accounts/ethstore/Cargo.toml

@@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 log = "0.4"
 libc = "0.2"
-rand = "0.6"
+rand = "0.7"
 ethkey = { path = "../ethkey" }
 serde = "1.0"
 serde_json = "1.0"

accounts/ethstore/src/random.rs

@@ -23,7 +23,7 @@ pub trait Random {
 impl Random for [u8; 16] {
 	fn random() -> Self {
 		let mut result = [0u8; 16];
-		let mut rng = OsRng::new().unwrap();
+		let mut rng = OsRng;
 		rng.fill_bytes(&mut result);
 		result
 	}
@@ -32,14 +32,14 @@ impl Random for [u8; 16] {
 impl Random for [u8; 32] {
 	fn random() -> Self {
 		let mut result = [0u8; 32];
-		let mut rng = OsRng::new().unwrap();
+		let mut rng = OsRng;
 		rng.fill_bytes(&mut result);
 		result
 	}
 }
 
 /// Generate a random string of given length.
 pub fn random_string(length: usize) -> String {
-	let mut rng = OsRng::new().expect("Not able to operate without random source.");
+	let rng = OsRng;
 	rng.sample_iter(&Alphanumeric).take(length).collect()
 }

accounts/ethstore/tests/util/transient_dir.rs

@@ -21,7 +21,7 @@ use ethstore::accounts_dir::{KeyDirectory, RootDiskDirectory};
 use ethstore::{Error, SafeAccount};
 
 pub fn random_dir() -> PathBuf {
-	let mut rng = OsRng::new().unwrap();
+	let mut rng = OsRng;
 	let mut dir = env::temp_dir();
 	dir.push(format!("{:x}-{:x}", rng.next_u64(), rng.next_u64()));
 	dir

ethcore/Cargo.toml

@@ -45,7 +45,8 @@ parking_lot = "0.9"
 pod = { path = "pod", optional = true }
 trie-db = "0.15.0"
 patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
-rand = "0.6"
+rand = "0.7"
+rand_xorshift = "0.2"
 rayon = "1.1"
 registrar = { path = "../util/registrar" }
 rlp = "0.4.0"

ethcore/blockchain/Cargo.toml

@@ -19,8 +19,8 @@ itertools = "0.5"
 kvdb = "0.1"
 log = "0.4"
 parity-bytes = "0.1"
+rand = "0.7"
 parking_lot = "0.9"
-rand = "0.6"
 rayon = "1.0"
 rlp = "0.4.0"
 rlp_compress = { path = "../../util/rlp-compress" }

ethcore/engines/authority-round/Cargo.toml

@@ -23,7 +23,6 @@ lru-cache = "0.1"
 machine = { path = "../../machine" }
 macros = { path = "../../../util/macros" }
 parking_lot = "0.9"
-rand = "0.6"
 rlp = "0.4.0"
 time-utils = { path = "../../../util/time-utils" }
 unexpected = { path = "../../../util/unexpected" }

ethcore/engines/clique/Cargo.toml

@@ -19,8 +19,8 @@ log = "0.4"
 lru-cache = "0.1"
 machine = { path = "../../machine" }
 macros = { path = "../../../util/macros" }
+rand = "0.7"
 parking_lot = "0.9"
-rand = "0.6"
 rlp = "0.4.0"
 time-utils = { path = "../../../util/time-utils" }
 unexpected = { path = "../../../util/unexpected" }

ethcore/light/Cargo.toml

@@ -33,7 +33,7 @@ rlp = "0.4.0"
 rlp_derive = { path = "../../util/rlp-derive" }
 smallvec = "0.6"
 futures = "0.1"
-rand = "0.6"
+rand = "0.7"
 bincode = "1.1"
 serde = "1.0"
 serde_derive = "1.0"

ethcore/snapshot/Cargo.toml

@@ -28,9 +28,9 @@ keccak-hasher = { path = "../../util/keccak-hasher" }
 kvdb = "0.1"
 log = "0.4.8"
 num_cpus = "1.10.1"
+rand = "0.7"
+rand_xorshift = "0.2"
 parking_lot = "0.9"
-rand = "0.6"
-rand_xorshift = "0.1.1"
 rlp = "0.4.2"
 rlp_derive = { path = "../../util/rlp-derive" }
 snappy = { package = "parity-snappy", version ="0.1.0" }

ethcore/snapshot/snapshot-tests/Cargo.toml

@@ -28,8 +28,8 @@ kvdb = "0.1"
 kvdb-rocksdb = { version = "0.1.5" }
 log = "0.4.8"
 parking_lot = "0.9"
-rand = "0.6"
-rand_xorshift = "0.1.1"
+rand = "0.7"
+rand_xorshift = "0.2"
 rlp = "0.4.2"
 snappy = { package = "parity-snappy", version ="0.1.0" }
 snapshot = { path = "../../snapshot", features = ["test-helpers"] }

ethcore/snapshot/src/consensus/work.rs

@@ -222,7 +222,7 @@ impl PowRebuilder {
 		Ok(PowRebuilder {
 			chain,
 			db,
-			rng: OsRng::new().map_err(|e| format!("{}", e))?,
+			rng: OsRng,
 			disconnected: Vec::new(),
 			best_number: manifest.block_number,
 			best_hash: manifest.block_hash,

ethcore/src/client/client.rs

@@ -469,7 +469,7 @@ impl Importer {
 		{
 			trace_time!("import_old_block");
 			// verify the block, passing the chain for updating the epoch verifier.
-			let mut rng = OsRng::new().map_err(|e| format!("{}", e))?;
+			let mut rng = OsRng;
 			self.ancient_verifier.verify(&mut rng, &unverified.header, &chain)?;
 
 			// Commit results

ethcore/sync/Cargo.toml

@@ -27,8 +27,8 @@ macros = { path = "../../util/macros" }
 network = { package = "ethcore-network", path = "../../util/network" }
 parity-runtime = { path = "../../util/runtime" }
 parity-util-mem = "0.2.0"
+rand = "0.7"
 parking_lot = "0.9"
-rand = "0.6"
 rlp = "0.4.0"
 snapshot = { path = "../snapshot" }
 trace-time = "0.1"
@@ -41,6 +41,6 @@ ethcore = { path = "..", features = ["test-helpers"] }
 ethcore-io = { path = "../../util/io", features = ["mio"] }
 kvdb-memorydb = "0.1.2"
 machine = { path = "../machine" }
-rand_xorshift = "0.1.1"
+rand_xorshift = "0.2"
 rustc-hex = "1.0"
 spec = { path = "../spec" }

ethcore/sync/src/light_sync/mod.rs

@@ -716,7 +716,7 @@ impl<L: AsLightClient> LightSync<L> {
 			peers: RwLock::new(HashMap::new()),
 			pending_reqs: Mutex::new(HashMap::new()),
 			client: client,
-			rng: Mutex::new(OsRng::new()?),
+			rng: Mutex::new(OsRng),
 			senders: RwLock::new(Vec::new()),
 			state: Mutex::new(SyncStateWrapper::idle()),
 			is_idle: Mutex::new(true),

rpc/Cargo.toml

@@ -14,14 +14,14 @@ futures = "0.1.6"
 log = "0.4"
 multihash = "0.8"
 order-stat = "0.1"
-parking_lot = "0.9"
-rand = "0.6"
-rand_xorshift = "0.1.1"
+rand = "0.7"
+rand_xorshift = "0.2"
 rustc-hex = "1.0"
 semver = "0.9"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
+parking_lot = "0.9"
 tempdir = "0.3"
 tiny-keccak = "1.4"
 tokio-timer = "0.1"

rpc/src/authcodes.rs

@@ -173,7 +173,7 @@ impl<T: TimeProvider> AuthCodes<T> {
 
 	/// Generates and returns a new code that can be used by `SignerUIs`
 	pub fn generate_new(&mut self) -> io::Result<String> {
-		let mut rng = OsRng::new()?;
+		let rng = OsRng;
 		let code = rng.sample_iter(&Alphanumeric).take(TOKEN_LENGTH).collect::<String>();
 		let readable_code = code.as_bytes()
 			.chunks(4)

rpc/src/v1/helpers/secretstore.rs

@@ -118,7 +118,7 @@ fn into_document_key(key: Bytes) -> Result<Bytes, Error> {
 
 fn initialization_vector() -> [u8; INIT_VEC_LEN] {
 	let mut result = [0u8; INIT_VEC_LEN];
-	let mut rng = OsRng::new().unwrap();
+	let mut rng = OsRng;
 	rng.fill_bytes(&mut result);
 	result
 }

rpc/src/v1/helpers/subscribers.rs

@@ -18,7 +18,7 @@
 
 use std::{ops, str};
 use std::collections::HashMap;
-use rand::RngCore;
+
 use jsonrpc_pubsub::{typed::{Subscriber, Sink}, SubscriptionId};
 use ethereum_types::H64;
 
@@ -44,11 +44,11 @@ impl Id {
 
 #[cfg(not(test))]
 mod random {
-	use rand;
+	use rand::rngs::OsRng;
 
 	pub type Rng = rand::rngs::OsRng;
 
-	pub fn new() -> Rng { Rng::new().expect("Valid random source is required.") }
+	pub fn new() -> Rng { OsRng }
 }
 
 #[cfg(test)]
@@ -79,9 +79,7 @@ impl<T> Default for Subscribers<T> {
 
 impl<T> Subscribers<T> {
 	fn next_id(&mut self) -> Id {
-		let mut data = H64::default();
-		// TODO [grbIzl] rework with proper H64::random_using with rand 0.7
-		self.rand.fill_bytes(&mut data.as_bytes_mut());
+		let data = H64::random_using(&mut self.rand);
 		Id(data)
 	}
 

rpc/src/v1/helpers/subscription_manager.rs

@@ -165,7 +165,7 @@ mod tests {
 		let mut el = Runtime::new().unwrap();
 		let mut poll_manager = poll_manager();
 		let (id, rx) = poll_manager.subscribe(Default::default(), "hello".into(), Params::None);
-		assert_eq!(id, SubscriptionId::String("0x4333966aca52ad0b".into()));
+		assert_eq!(id, SubscriptionId::String("0x43ca64edf03768e1".into()));
 
 		// then
 		poll_manager.tick().wait().unwrap();