From a37c926a89aa8364b29c85dc9c00c4883074c1b1 Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Sun, 20 Sep 2020 13:09:03 -0600 Subject: [PATCH] Address clippy lints --- src/arithmetic.rs | 4 ++-- src/plonk.rs | 10 +++++----- src/plonk/prover.rs | 12 ++++++------ src/poly.rs | 4 ++-- src/poly/commitment.rs | 16 ++++++++-------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/arithmetic.rs b/src/arithmetic.rs index a7193a8..d14d4d3 100644 --- a/src/arithmetic.rs +++ b/src/arithmetic.rs @@ -47,9 +47,9 @@ where { fn batch_invert(self) -> F { let mut acc = F::one(); - let mut iter = self.into_iter(); + let iter = self.into_iter(); let mut tmp = Vec::with_capacity(iter.size_hint().0); - while let Some(p) = iter.next() { + for p in iter { let q = *p; tmp.push((acc, p)); acc = F::conditional_select(&(acc * q), &acc, q.is_zero()); diff --git a/src/plonk.rs b/src/plonk.rs index 6def55e..553df39 100644 --- a/src/plonk.rs +++ b/src/plonk.rs @@ -395,26 +395,26 @@ fn test_proving() { .unwrap(); { let msm = guard.clone().use_challenges(); - assert!(msm.is_zero()); + assert!(msm.eval()); } { let g = guard.compute_g(); let (msm, _) = guard.clone().use_g(g); - assert!(msm.is_zero()); + assert!(msm.eval()); } let msm = guard.clone().use_challenges(); - assert!(msm.clone().is_zero()); + assert!(msm.clone().eval()); let guard = proof .verify::, DummyHash>(¶ms, &srs, msm, &[pubinput]) .unwrap(); { let msm = guard.clone().use_challenges(); - assert!(msm.is_zero()); + assert!(msm.eval()); } { let g = guard.compute_g(); let (msm, _) = guard.clone().use_g(g); - assert!(msm.is_zero()); + assert!(msm.eval()); } } } diff --git a/src/plonk/prover.rs b/src/plonk/prover.rs index 7c7d514..8d347de 100644 --- a/src/plonk/prover.rs +++ b/src/plonk/prover.rs @@ -108,8 +108,7 @@ impl Proof { } let aux_polys: Vec<_> = aux - .clone() - .into_iter() + .iter() .map(|poly| { let lagrange_vec = domain.lagrange_from_vec(poly.to_vec()); domain.lagrange_to_coeff(lagrange_vec) @@ -616,7 +615,7 @@ impl Proof { let x_7: C::Scalar = get_challenge_scalar(Challenge(transcript.squeeze().get_lower_128())); - let mut f_blind_dup = f_blind.clone(); + let mut f_blind_dup = f_blind; let mut f_poly = f_poly.clone(); for (_, &point_index) in meta.rotations.iter() { f_blind_dup *= x_7; @@ -632,10 +631,11 @@ impl Proof { } }); } - let opening = OpeningProof::create(¶ms, &mut transcript, &f_poly, f_blind_dup, x_6); - if opening.is_ok() { - break (opening.unwrap(), q_evals); + if let Ok(opening) = + OpeningProof::create(¶ms, &mut transcript, &f_poly, f_blind_dup, x_6) + { + break (opening, q_evals); } else { f_blind += C::Scalar::one(); f_commitment = (f_commitment + params.h).to_affine(); diff --git a/src/poly.rs b/src/poly.rs index d5f1153..2467599 100644 --- a/src/poly.rs +++ b/src/poly.rs @@ -119,9 +119,9 @@ impl Polynomial { self.values.iter_mut() } - /// Gets the length of this polynomial in terms of the number of + /// Gets the size of this polynomial in terms of the number of /// coefficients used to describe it. - pub fn len(&self) -> usize { + pub fn num_coeffs(&self) -> usize { self.values.len() } } diff --git a/src/poly/commitment.rs b/src/poly/commitment.rs index 77ac408..8348b77 100644 --- a/src/poly/commitment.rs +++ b/src/poly/commitment.rs @@ -60,8 +60,8 @@ impl<'a, C: CurveAffine> MSM<'a, C> { /// Add arbitrary term (the scalar and the point) pub fn add_term(&mut self, scalar: C::Scalar, point: C) { - &self.other_scalars.push(scalar); - &self.other_bases.push(point); + self.other_scalars.push(scalar); + self.other_bases.push(point); } /// Add a vector of scalars to `g_scalars`. This function will panic if the @@ -100,7 +100,7 @@ impl<'a, C: CurveAffine> MSM<'a, C> { } /// Perform multiexp and check that it results in zero - pub fn is_zero(self) -> bool { + pub fn eval(self) -> bool { let len = self.g_scalars.as_ref().map(|v| v.len()).unwrap_or(0) + self.h_scalar.map(|_| 1).unwrap_or(0) + self.other_scalars.len(); @@ -304,7 +304,7 @@ impl<'a, C: CurveAffine> Guard<'a, C> { /// Lets caller supply the purported G point and simply appends it to /// return an updated MSM. pub fn use_g(mut self, g: C) -> (MSM<'a, C>, Accumulator) { - &self.msm.add_term(self.neg_z1, g); + self.msm.add_term(self.neg_z1, g); let accumulator = Accumulator { g, @@ -458,12 +458,12 @@ fn test_opening_proof() { { // Test use_challenges() let msm_challenges = guard.clone().use_challenges(); - assert!(msm_challenges.is_zero()); + assert!(msm_challenges.eval()); // Test use_g() let g = guard.compute_g(); let (msm_g, _accumulator) = guard.clone().use_g(g); - assert!(msm_g.is_zero()); + assert!(msm_g.eval()); } // Check another proof to populate `msm.g_scalars` @@ -483,12 +483,12 @@ fn test_opening_proof() { // Test use_challenges() let msm_challenges = guard.clone().use_challenges(); - assert!(msm_challenges.is_zero()); + assert!(msm_challenges.eval()); // Test use_g() let g = guard.compute_g(); let (msm_g, _accumulator) = guard.clone().use_g(g); - assert!(msm_g.is_zero()); + assert!(msm_g.eval()); break; }