update from rand_os to fix warnings

This commit is contained in:
NikVolf
2019-09-28 10:48:43 +03:00
parent 30660e1d1c
commit b42477a0bf
13 changed files with 13 additions and 33 deletions

View File

@@ -20,7 +20,6 @@ log = "0.4"
pairing = { path = "../pairing" }
rand = "0.7"
rand_core = "0.5"
rand_os = "0.2"
sha2 = "0.8"
[dev-dependencies]

View File

@@ -2,13 +2,11 @@
extern crate pairing;
extern crate rand_core;
extern crate rand_os;
extern crate test;
extern crate zcash_primitives;
use pairing::bls12_381::Bls12;
use rand_core::RngCore;
use rand_os::OsRng;
use rand_core::{OsRng, RngCore};
use zcash_primitives::jubjub::JubjubBls12;
use zcash_primitives::pedersen_hash::{pedersen_hash, Personalization};

View File

@@ -202,12 +202,12 @@ impl<Node: Hashable> CommitmentTree<Node> {
/// ```
/// extern crate ff;
/// extern crate pairing;
/// extern crate rand_os;
/// extern crate rand_core;
/// extern crate zcash_primitives;
///
/// use ff::{Field, PrimeField};
/// use pairing::bls12_381::Fr;
/// use rand_os::OsRng;
/// use rand_core::OsRng;
/// use zcash_primitives::{
/// merkle_tree::{CommitmentTree, IncrementalWitness},
/// sapling::Node,

View File

@@ -214,12 +214,12 @@ fn prf_ock(
/// ```
/// extern crate ff;
/// extern crate pairing;
/// extern crate rand_os;
/// extern crate rand_core;
/// extern crate zcash_primitives;
///
/// use ff::Field;
/// use pairing::bls12_381::Bls12;
/// use rand_os::OsRng;
/// use rand_core::OsRng;
/// use zcash_primitives::{
/// jubjub::fs::Fs,
/// keys::OutgoingViewingKey,
@@ -556,8 +556,8 @@ mod tests {
use crypto_api_chachapoly::ChachaPolyIetf;
use ff::{Field, PrimeField, PrimeFieldRepr};
use pairing::bls12_381::{Bls12, Fr, FrRepr};
use rand_core::OsRng;
use rand_core::{CryptoRng, RngCore};
use rand_os::OsRng;
use std::str::FromStr;
use super::{

View File

@@ -74,7 +74,7 @@ pub trait TxProver {
pub(crate) mod mock {
use ff::Field;
use pairing::bls12_381::{Bls12, Fr};
use rand_os::OsRng;
use rand_core::OsRng;
use crate::{
jubjub::{edwards, fs::Fs, FixedGenerators, Unknown},

View File

@@ -534,7 +534,7 @@ impl<R: RngCore + CryptoRng> Builder<R> {
#[cfg(test)]
mod tests {
use ff::{Field, PrimeField};
use rand::rngs::OsRng;
use rand_core::OsRng;
use crate::jubjub::fs::Fs;

View File

@@ -1,6 +1,6 @@
use ff::Field;
use pairing::bls12_381::Bls12;
use rand_os::OsRng;
use rand_core::OsRng;
use crate::jubjub::{fs::Fs, FixedGenerators};