From 2e12ee8e8237c1c186fa28424cca017659ee6a93 Mon Sep 17 00:00:00 2001 From: wborgeaud Date: Thu, 15 Jul 2021 10:13:13 +0200 Subject: [PATCH] Minor --- src/circuit_builder.rs | 6 +++--- src/circuit_data.rs | 1 - src/copy_constraint.rs | 2 +- src/fri/recursive_verifier.rs | 2 +- src/gadgets/arithmetic_extension.rs | 2 +- src/gates/gate.rs | 1 - src/generator.rs | 6 ------ src/merkle_proofs.rs | 1 + src/polynomial/commitment.rs | 8 ++------ src/prover.rs | 3 --- src/witness.rs | 1 - 11 files changed, 9 insertions(+), 24 deletions(-) diff --git a/src/circuit_builder.rs b/src/circuit_builder.rs index 3b7db285..8bedf562 100644 --- a/src/circuit_builder.rs +++ b/src/circuit_builder.rs @@ -51,7 +51,7 @@ pub struct CircuitBuilder, const D: usize> { pub marked_targets: Vec>, /// Generators used to generate the witness. - pub generators: Vec>>, + generators: Vec>>, constants_to_targets: HashMap, targets_to_constants: HashMap, @@ -361,7 +361,7 @@ impl, const D: usize> CircuitBuilder { } } - pub fn blind_and_pad(&mut self) { + fn blind_and_pad(&mut self) { let (regular_poly_openings, z_openings) = self.blinding_counts(); info!( "Adding {} blinding terms for witness polynomials, and {}*2 for Z polynomials", @@ -414,7 +414,7 @@ impl, const D: usize> CircuitBuilder { } } - pub fn constant_polys( + fn constant_polys( &self, gates: &[PrefixedGate], num_constants: usize, diff --git a/src/circuit_data.rs b/src/circuit_data.rs index 56b23e3c..e6c9a8e0 100644 --- a/src/circuit_data.rs +++ b/src/circuit_data.rs @@ -9,7 +9,6 @@ use crate::fri::FriConfig; use crate::gates::gate::{GateInstance, PrefixedGate}; use crate::generator::WitnessGenerator; use crate::polynomial::commitment::ListPolynomialCommitment; -use crate::polynomial::polynomial::PolynomialValues; use crate::proof::{Hash, HashTarget, Proof}; use crate::prover::prove; use crate::target::Target; diff --git a/src/copy_constraint.rs b/src/copy_constraint.rs index 0798f2a8..f1f1d3d9 100644 --- a/src/copy_constraint.rs +++ b/src/copy_constraint.rs @@ -9,7 +9,7 @@ impl From<(Target, Target)> for CopyConstraint { fn from(pair: (Target, Target)) -> Self { Self { pair, - name: String::default(), + name: String::new(), } } } diff --git a/src/fri/recursive_verifier.rs b/src/fri/recursive_verifier.rs index 3faa9f08..99e21622 100644 --- a/src/fri/recursive_verifier.rs +++ b/src/fri/recursive_verifier.rs @@ -190,7 +190,7 @@ impl, const D: usize> CircuitBuilder { .copied() .collect::>(); let mut single_numerator = alpha.reduce(&single_evals, self); - // TODO: Precompute the rhs as it is the same in all FRI round. + // TODO: Precompute the rhs as it is the same in all FRI rounds. let rhs = alpha.reduce(&single_openings, self); single_numerator = self.sub_extension(single_numerator, rhs); let single_denominator = self.sub_extension(subgroup_x, zeta); diff --git a/src/gadgets/arithmetic_extension.rs b/src/gadgets/arithmetic_extension.rs index 49748040..57968a23 100644 --- a/src/gadgets/arithmetic_extension.rs +++ b/src/gadgets/arithmetic_extension.rs @@ -459,7 +459,7 @@ mod tests { let config = CircuitConfig::large_config(); - let mut builder = CircuitBuilder::::new(config.clone()); + let mut builder = CircuitBuilder::::new(config); let x = FF::rand(); let y = FF::rand(); diff --git a/src/gates/gate.rs b/src/gates/gate.rs index 49b610ba..9b45817e 100644 --- a/src/gates/gate.rs +++ b/src/gates/gate.rs @@ -8,7 +8,6 @@ use crate::field::extension_field::{Extendable, FieldExtension}; use crate::field::field::Field; use crate::gates::gate_tree::Tree; use crate::generator::WitnessGenerator; -use crate::target::Target; use crate::vars::{EvaluationTargets, EvaluationVars, EvaluationVarsBase}; /// A custom gate. diff --git a/src/generator.rs b/src/generator.rs index ee2001ec..a47c5267 100644 --- a/src/generator.rs +++ b/src/generator.rs @@ -55,12 +55,6 @@ pub(crate) fn generate_partial_witness( pending_generator_indices = next_pending_generator_indices; } - for i in 0..generators.len() { - if !expired_generator_indices.contains(&i) { - dbg!(i); - break; - } - } assert_eq!( expired_generator_indices.len(), generators.len(), diff --git a/src/merkle_proofs.rs b/src/merkle_proofs.rs index a4652ca1..74bdf67d 100644 --- a/src/merkle_proofs.rs +++ b/src/merkle_proofs.rs @@ -124,6 +124,7 @@ impl, const D: usize> CircuitBuilder { ) } + // TODO: this is far from optimal. let leaf_index_rev = self.reverse_limbs::<2>(leaf_index, height); self.assert_equal(acc_leaf_index, leaf_index_rev); diff --git a/src/polynomial/commitment.rs b/src/polynomial/commitment.rs index 6f48fe30..7c580ad9 100644 --- a/src/polynomial/commitment.rs +++ b/src/polynomial/commitment.rs @@ -20,7 +20,6 @@ use crate::util::{log2_ceil, log2_strict, reverse_bits, reverse_index_bits_in_pl pub const SALT_SIZE: usize = 2; pub struct ListPolynomialCommitment { - pub original_values: Vec>, // TODO: Remove when debugging is done. pub polynomials: Vec>, pub merkle_tree: MerkleTree, pub degree: usize, @@ -42,7 +41,7 @@ impl ListPolynomialCommitment { "to compute LDE" ); - Self::new_from_data(values, polynomials, lde_values, degree, rate_bits, blinding) + Self::new_from_data(polynomials, lde_values, degree, rate_bits, blinding) } /// Creates a list polynomial commitment for the polynomials `polynomials`. @@ -52,17 +51,15 @@ impl ListPolynomialCommitment { blinding: bool, ) -> Self { let degree = polynomials[0].len(); - let values = polynomials.iter().map(|p| p.clone().fft()).collect(); let lde_values = timed!( Self::lde_values(&polynomials, rate_bits, blinding), "to compute LDE" ); - Self::new_from_data(values, polynomials, lde_values, degree, rate_bits, blinding) + Self::new_from_data(polynomials, lde_values, degree, rate_bits, blinding) } fn new_from_data( - values: Vec>, polynomials: Vec>, lde_values: Vec>, degree: usize, @@ -74,7 +71,6 @@ impl ListPolynomialCommitment { let merkle_tree = timed!(MerkleTree::new(leaves, false), "to build Merkle tree"); Self { - original_values: values, polynomials, merkle_tree, degree, diff --git a/src/prover.rs b/src/prover.rs index 4ff72608..d328299a 100644 --- a/src/prover.rs +++ b/src/prover.rs @@ -1,4 +1,3 @@ -use std::collections::HashMap; use std::time::Instant; use log::info; @@ -6,7 +5,6 @@ use rayon::prelude::*; use crate::circuit_data::{CommonCircuitData, ProverOnlyCircuitData}; use crate::field::extension_field::Extendable; -use crate::field::field::Field; use crate::generator::generate_partial_witness; use crate::plonk_challenger::Challenger; use crate::plonk_common::{PlonkPolynomials, ZeroPolyOnCoset}; @@ -14,7 +12,6 @@ use crate::polynomial::commitment::ListPolynomialCommitment; use crate::polynomial::polynomial::{PolynomialCoeffs, PolynomialValues}; use crate::proof::Proof; use crate::timed; -use crate::util::marking::MarkedTargets; use crate::util::partial_products::partial_products; use crate::util::{log2_ceil, transpose}; use crate::vanishing_poly::{ diff --git a/src/witness.rs b/src/witness.rs index 1190fc8f..ac555f82 100644 --- a/src/witness.rs +++ b/src/witness.rs @@ -183,7 +183,6 @@ impl PartialWitness { F: Extendable, { for CopyConstraint { pair: (a, b), name } in copy_constraints { - // TODO: Take care of public inputs once they land. let va = self.try_get_target(*a).unwrap_or(F::ZERO); let vb = self.try_get_target(*b).unwrap_or(F::ZERO); let desc = |t: &Target| -> String {