From b89f4d656d362cb825279612d822922b16dd2fba Mon Sep 17 00:00:00 2001 From: Daniel Lubarov Date: Mon, 9 Aug 2021 10:11:42 -0700 Subject: [PATCH] Update various dependencies (#163) --- Cargo.toml | 8 ++++---- src/field/crandall_field.rs | 2 +- src/gadgets/split_base.rs | 2 +- src/hash/merkle_proofs.rs | 2 +- src/polynomial/polynomial.rs | 18 +++++++++--------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index fa22a769..4d40b44e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,12 +12,12 @@ edition = "2018" default-run = "bench_recursion" [dependencies] -env_logger = "0.8.3" +env_logger = "0.9.0" log = "0.4.14" itertools = "0.10.0" -num = "0.3" -rand = "0.7.3" -rand_chacha = "0.2.2" +num = "0.4" +rand = "0.8.4" +rand_chacha = "0.3.1" rayon = "1.5.1" unroll = "0.1.5" anyhow = "1.0.40" diff --git a/src/field/crandall_field.rs b/src/field/crandall_field.rs index ebdb9e25..fba11677 100644 --- a/src/field/crandall_field.rs +++ b/src/field/crandall_field.rs @@ -343,7 +343,7 @@ impl Field for CrandallField { } fn rand_from_rng(rng: &mut R) -> Self { - Self::from_canonical_u64(rng.gen_range(0, FIELD_ORDER)) + Self::from_canonical_u64(rng.gen_range(0..FIELD_ORDER)) } } diff --git a/src/gadgets/split_base.rs b/src/gadgets/split_base.rs index ff420ba0..9b481e78 100644 --- a/src/gadgets/split_base.rs +++ b/src/gadgets/split_base.rs @@ -128,7 +128,7 @@ mod tests { let pw = PartialWitness::new(config.num_wires); let mut builder = CircuitBuilder::::new(config); - let n = thread_rng().gen_range(0, 1 << 10); + let n = thread_rng().gen_range(0..(1 << 10)); let x = builder.constant(F::from_canonical_usize(n)); let zero = builder.zero(); diff --git a/src/hash/merkle_proofs.rs b/src/hash/merkle_proofs.rs index 088ffc5a..30391a98 100644 --- a/src/hash/merkle_proofs.rs +++ b/src/hash/merkle_proofs.rs @@ -161,7 +161,7 @@ mod tests { let n = 1 << log_n; let leaves = random_data::(n, 7); let tree = MerkleTree::new(leaves, false); - let i: usize = thread_rng().gen_range(0, n); + let i: usize = thread_rng().gen_range(0..n); let proof = tree.prove(i); let proof_t = MerkleProofTarget { diff --git a/src/polynomial/polynomial.rs b/src/polynomial/polynomial.rs index 32b16597..4e15be56 100644 --- a/src/polynomial/polynomial.rs +++ b/src/polynomial/polynomial.rs @@ -453,7 +453,7 @@ mod tests { fn test_polynomial_multiplication() { type F = CrandallField; let mut rng = thread_rng(); - let (a_deg, b_deg) = (rng.gen_range(1, 10_000), rng.gen_range(1, 10_000)); + let (a_deg, b_deg) = (rng.gen_range(1..10_000), rng.gen_range(1..10_000)); let a = PolynomialCoeffs::new(F::rand_vec(a_deg)); let b = PolynomialCoeffs::new(F::rand_vec(b_deg)); let m1 = &a * &b; @@ -469,8 +469,8 @@ mod tests { fn test_inv_mod_xn() { type F = CrandallField; let mut rng = thread_rng(); - let a_deg = rng.gen_range(1, 1_000); - let n = rng.gen_range(1, 1_000); + let a_deg = rng.gen_range(1..1_000); + let n = rng.gen_range(1..1_000); let a = PolynomialCoeffs::new(F::rand_vec(a_deg)); let b = a.inv_mod_xn(n); let mut m = &a * &b; @@ -491,7 +491,7 @@ mod tests { fn test_polynomial_long_division() { type F = CrandallField; let mut rng = thread_rng(); - let (a_deg, b_deg) = (rng.gen_range(1, 10_000), rng.gen_range(1, 10_000)); + let (a_deg, b_deg) = (rng.gen_range(1..10_000), rng.gen_range(1..10_000)); let a = PolynomialCoeffs::new(F::rand_vec(a_deg)); let b = PolynomialCoeffs::new(F::rand_vec(b_deg)); let (q, r) = a.div_rem_long_division(&b); @@ -505,7 +505,7 @@ mod tests { fn test_polynomial_division() { type F = CrandallField; let mut rng = thread_rng(); - let (a_deg, b_deg) = (rng.gen_range(1, 10_000), rng.gen_range(1, 10_000)); + let (a_deg, b_deg) = (rng.gen_range(1..10_000), rng.gen_range(1..10_000)); let a = PolynomialCoeffs::new(F::rand_vec(a_deg)); let b = PolynomialCoeffs::new(F::rand_vec(b_deg)); let (q, r) = a.div_rem(&b); @@ -519,7 +519,7 @@ mod tests { fn test_polynomial_division_by_constant() { type F = CrandallField; let mut rng = thread_rng(); - let a_deg = rng.gen_range(1, 10_000); + let a_deg = rng.gen_range(1..10_000); let a = PolynomialCoeffs::new(F::rand_vec(a_deg)); let b = PolynomialCoeffs::from(vec![F::rand()]); let (q, r) = a.div_rem(&b); @@ -533,8 +533,8 @@ mod tests { fn test_division_by_z_h() { type F = CrandallField; let mut rng = thread_rng(); - let a_deg = rng.gen_range(1, 10_000); - let n = rng.gen_range(1, a_deg); + let a_deg = rng.gen_range(1..10_000); + let n = rng.gen_range(1..a_deg); let mut a = PolynomialCoeffs::new(F::rand_vec(a_deg)); a.trim(); let z_h = { @@ -573,7 +573,7 @@ mod tests { PolynomialCoeffs::new(xn_min_one_vec) }; - let a = g.exp(rng.gen_range(0, n as u64)); + let a = g.exp(rng.gen_range(0..(n as u64))); let denom = PolynomialCoeffs::new(vec![-a, F::ONE]); let now = Instant::now(); xn_minus_one.div_rem(&denom);