Update rand crate to 0.5 (#1542)
* Update rand crate to 0.5 * Rustfmt * Misplaced import
This commit is contained in:
committed by
Yeastplume
parent
b35950790b
commit
345a6cb53e
Generated
+13
-13
@@ -650,7 +650,7 @@ dependencies = [
|
||||
"grin_wallet 0.3.0",
|
||||
"lmdb-zero 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"slog 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -688,7 +688,7 @@ dependencies = [
|
||||
"lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"num-bigint 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -702,7 +702,7 @@ dependencies = [
|
||||
"blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"grin_util 0.3.0",
|
||||
"rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -726,7 +726,7 @@ dependencies = [
|
||||
"lmdb-zero 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"slog 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -744,7 +744,7 @@ dependencies = [
|
||||
"grin_store 0.3.0",
|
||||
"grin_util 0.3.0",
|
||||
"grin_wallet 0.3.0",
|
||||
"rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"slog 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -774,7 +774,7 @@ dependencies = [
|
||||
"itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"jsonrpc-core 8.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"lmdb-zero 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_json 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -796,7 +796,7 @@ dependencies = [
|
||||
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"lmdb-zero 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"slog 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -809,8 +809,8 @@ dependencies = [
|
||||
"backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"secp256k1zkp 0.7.1 (git+https://github.com/mimblewimble/rust-secp256k1-zkp?tag=grin_integration_23)",
|
||||
"rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"secp256k1zkp 0.7.1 (git+https://github.com/mimblewimble/rust-secp256k1-zkp?tag=grin_integration_23a)",
|
||||
"serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"slog 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -838,7 +838,7 @@ dependencies = [
|
||||
"grin_util 0.3.0",
|
||||
"hyper 0.12.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"prettytable-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_json 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1836,12 +1836,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
[[package]]
|
||||
name = "secp256k1zkp"
|
||||
version = "0.7.1"
|
||||
source = "git+https://github.com/mimblewimble/rust-secp256k1-zkp?tag=grin_integration_23#6f599fcc17b98340d0c4c9d87cc48d51f29d3816"
|
||||
source = "git+https://github.com/mimblewimble/rust-secp256k1-zkp?tag=grin_integration_23a#0248d26f309ec7b1da0b0944de62a96cdef51fbd"
|
||||
dependencies = [
|
||||
"arrayvec 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_json 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -2726,7 +2726,7 @@ dependencies = [
|
||||
"checksum schannel 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "dc1fabf2a7b6483a141426e1afd09ad543520a77ac49bd03c286e7696ccfd77f"
|
||||
"checksum scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28"
|
||||
"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
|
||||
"checksum secp256k1zkp 0.7.1 (git+https://github.com/mimblewimble/rust-secp256k1-zkp?tag=grin_integration_23)" = "<none>"
|
||||
"checksum secp256k1zkp 0.7.1 (git+https://github.com/mimblewimble/rust-secp256k1-zkp?tag=grin_integration_23a)" = "<none>"
|
||||
"checksum security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "dfa44ee9c54ce5eecc9de7d5acbad112ee58755239381f687e564004ba4a2332"
|
||||
"checksum security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5421621e836278a0b139268f36eee0dc7e389b784dc3f79d8f11aabadf41bead"
|
||||
"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
|
||||
|
||||
+1
-1
@@ -26,4 +26,4 @@ grin_util = { path = "../util" }
|
||||
[dev-dependencies]
|
||||
grin_wallet = { path = "../wallet" }
|
||||
env_logger = "0.5"
|
||||
rand = "0.3"
|
||||
rand = "0.5"
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ failure_derive = "0.1"
|
||||
lazy_static = "1"
|
||||
lru-cache = "0.1"
|
||||
num-bigint = "0.2"
|
||||
rand = "0.3"
|
||||
rand = "0.5"
|
||||
serde = "1"
|
||||
serde_derive = "1"
|
||||
siphasher = "0.2"
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
//! Compact Blocks.
|
||||
|
||||
use rand::{thread_rng, Rng};
|
||||
use rand::{thread_rng, RngCore};
|
||||
|
||||
use consensus::VerifySortOrder;
|
||||
use core::block::{Block, BlockHeader, Error};
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ publish = false
|
||||
[dependencies]
|
||||
byteorder = "1"
|
||||
blake2-rfc = "0.2"
|
||||
rand = "0.3"
|
||||
rand = "0.5"
|
||||
slog = { version = "~2.3", features = ["max_level_trace", "release_max_level_trace"] }
|
||||
serde = "1"
|
||||
serde_derive = "1"
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
|
||||
/// Implementation of the Keychain trait based on an extended key derivation
|
||||
/// scheme.
|
||||
use rand::distributions::Alphanumeric;
|
||||
use rand::{thread_rng, Rng};
|
||||
use std::collections::HashMap;
|
||||
use std::sync::{Arc, RwLock};
|
||||
@@ -50,7 +51,7 @@ impl Keychain for ExtKeychain {
|
||||
|
||||
/// For testing - probably not a good idea to use outside of tests.
|
||||
fn from_random_seed() -> Result<ExtKeychain, Error> {
|
||||
let seed: String = thread_rng().gen_ascii_chars().take(16).collect();
|
||||
let seed: String = thread_rng().sample_iter(&Alphanumeric).take(16).collect();
|
||||
let seed = blake2::blake2b::blake2b(32, &[], seed.as_bytes());
|
||||
ExtKeychain::from_seed(seed.as_bytes())
|
||||
}
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ enum_primitive = "0.1"
|
||||
lmdb-zero = "0.4.4"
|
||||
net2 = "0.2"
|
||||
num = "0.1"
|
||||
rand = "0.3"
|
||||
rand = "0.5"
|
||||
serde = "1"
|
||||
serde_derive = "1"
|
||||
slog = { version = "~2.3", features = ["max_level_trace", "release_max_level_trace"] }
|
||||
|
||||
@@ -17,7 +17,7 @@ use std::net::{SocketAddr, TcpStream};
|
||||
use std::sync::{Arc, RwLock};
|
||||
|
||||
use rand::os::OsRng;
|
||||
use rand::Rng;
|
||||
use rand::RngCore;
|
||||
|
||||
use core::core::hash::Hash;
|
||||
use core::core::target::Difficulty;
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ publish = false
|
||||
|
||||
[dependencies]
|
||||
blake2-rfc = "0.2"
|
||||
rand = "0.3"
|
||||
rand = "0.5"
|
||||
serde = "1"
|
||||
serde_derive = "1"
|
||||
slog = { version = "~2.3", features = ["max_level_trace", "release_max_level_trace"] }
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ http = "0.1"
|
||||
hyper-staticfile = "0.3"
|
||||
itertools = "0.7"
|
||||
lmdb-zero = "0.4.4"
|
||||
rand = "0.3"
|
||||
rand = "0.5"
|
||||
slog = { version = "~2.3", features = ["max_level_trace", "release_max_level_trace"] }
|
||||
serde = "1"
|
||||
serde_derive = "1"
|
||||
|
||||
+1
-1
@@ -23,4 +23,4 @@ grin_util = { path = "../util" }
|
||||
|
||||
[dev-dependencies]
|
||||
chrono = "0.4.4"
|
||||
rand = "0.3"
|
||||
rand = "0.5"
|
||||
|
||||
+2
-2
@@ -9,7 +9,7 @@ publish = false
|
||||
backtrace = "0.3"
|
||||
byteorder = "1"
|
||||
lazy_static = "1"
|
||||
rand = "0.3"
|
||||
rand = "0.5"
|
||||
serde = "1"
|
||||
serde_derive = "1"
|
||||
slog = { version = "~2.3", features = ["max_level_trace", "release_max_level_trace"] }
|
||||
@@ -20,6 +20,6 @@ zip = "0.4"
|
||||
|
||||
[dependencies.secp256k1zkp]
|
||||
git = "https://github.com/mimblewimble/rust-secp256k1-zkp"
|
||||
tag = "grin_integration_23"
|
||||
tag = "grin_integration_23a"
|
||||
#path = "../../rust-secp256k1-zkp"
|
||||
features = ["bullet-proof-sizing"]
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ failure_derive = "0.1"
|
||||
futures = "0.1"
|
||||
hyper = "0.12"
|
||||
prettytable-rs = "0.7"
|
||||
rand = "0.3"
|
||||
rand = "0.5"
|
||||
serde = "1"
|
||||
serde_derive = "1"
|
||||
serde_json = "1"
|
||||
|
||||
Reference in New Issue
Block a user