diff --git a/src/fri/prover.rs b/src/fri/prover.rs index c1f53a1c..abddfcd7 100644 --- a/src/fri/prover.rs +++ b/src/fri/prover.rs @@ -103,7 +103,7 @@ fn fri_committed_trees, const D: usize>( values = coeffs.coset_fft(shift.into()) } - /// The coefficients being removed here should always be zero. + // The coefficients being removed here should always be zero. coeffs.coeffs.truncate(coeffs.len() >> config.rate_bits); challenger.observe_extension_elements(&coeffs.coeffs); diff --git a/src/fri/recursive_verifier.rs b/src/fri/recursive_verifier.rs index 2784ceef..5ad9429f 100644 --- a/src/fri/recursive_verifier.rs +++ b/src/fri/recursive_verifier.rs @@ -91,7 +91,7 @@ impl, const D: usize> CircuitBuilder { // Size of the LDE domain. let n = proof.final_poly.len() << (total_arities + config.rate_bits); - challenger.observe_opening_set(&os); + challenger.observe_opening_set(os); // Scaling factor to combine polynomials. let alpha = challenger.get_extension_challenge(self); @@ -284,8 +284,8 @@ impl, const D: usize> CircuitBuilder { // TODO: Do we need to range check `x_index` to a target smaller than `p`? let x_index = challenger.get_challenge(self); let mut x_index_bits = self.low_bits(x_index, n_log, 64); - let cap_index = self - .le_sum(x_index_bits[x_index_bits.len() - common_data.config.cap_height..].into_iter()); + let cap_index = + self.le_sum(x_index_bits[x_index_bits.len() - common_data.config.cap_height..].iter()); with_context!( self, "check FRI initial proof", @@ -305,7 +305,6 @@ impl, const D: usize> CircuitBuilder { let phi = self.exp_from_bits(phi, x_index_bits.iter().rev()); let g_ext = self.convert_to_ext(g); let phi_ext = self.convert_to_ext(phi); - let zero = self.zero_extension(); // `subgroup_x = g*phi, vanish_zeta = g*phi - zeta` let subgroup_x = self.mul(g, phi); let vanish_zeta = self.mul_sub_extension(g_ext, phi_ext, zeta); @@ -349,7 +348,7 @@ impl, const D: usize> CircuitBuilder { "infer evaluation using interpolation", self.compute_evaluation( subgroup_x, - &x_index_within_coset_bits, + x_index_within_coset_bits, arity_bits, evals, betas[i], @@ -389,7 +388,6 @@ impl, const D: usize> CircuitBuilder { struct PrecomputedReducedEvalsTarget { pub single: ExtensionTarget, pub zs: ExtensionTarget, - pub zs_right: ExtensionTarget, /// Slope of the line from `(zeta, zs)` to `(zeta_right, zs_right)`. pub slope: ExtensionTarget, pub zeta_right: ExtensionTarget, @@ -426,7 +424,6 @@ impl PrecomputedReducedEvalsTarget { Self { single, zs, - zs_right, slope: builder.div_extension(numerator, denominator), zeta_right, } diff --git a/src/gadgets/arithmetic_extension.rs b/src/gadgets/arithmetic_extension.rs index a27da240..b7d7a39a 100644 --- a/src/gadgets/arithmetic_extension.rs +++ b/src/gadgets/arithmetic_extension.rs @@ -1,6 +1,5 @@ use std::convert::TryInto; -use itertools::Itertools; use num::Integer; use crate::field::extension_field::target::{ExtensionAlgebraTarget, ExtensionTarget}; @@ -9,7 +8,6 @@ use crate::field::field_types::Field; use crate::gates::arithmetic::{ArithmeticExtensionGate, NUM_ARITHMETIC_OPS}; use crate::iop::generator::{GeneratedValues, SimpleGenerator}; use crate::iop::target::Target; -use crate::iop::wire::Wire; use crate::iop::witness::PartialWitness; use crate::plonk::circuit_builder::CircuitBuilder; use crate::util::bits_u64; @@ -455,7 +453,6 @@ impl, const D: usize> CircuitBuilder { z: ExtensionTarget, ) -> ExtensionTarget { let inv = self.add_virtual_extension_target(); - let zero = self.zero_extension(); let one = self.one_extension(); self.add_generator(QuotientGeneratorExtension { numerator: one, diff --git a/src/gadgets/select.rs b/src/gadgets/select.rs index 8591a631..3be3455c 100644 --- a/src/gadgets/select.rs +++ b/src/gadgets/select.rs @@ -1,6 +1,5 @@ use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::gates::arithmetic::ArithmeticExtensionGate; use crate::iop::target::{BoolTarget, Target}; use crate::plonk::circuit_builder::CircuitBuilder; diff --git a/src/gates/gmimc.rs b/src/gates/gmimc.rs index 070bb81e..5e8540ae 100644 --- a/src/gates/gmimc.rs +++ b/src/gates/gmimc.rs @@ -139,7 +139,7 @@ impl, const D: usize, const R: usize> Gate for GMiMCGate< for r in 0..R { let active = r % W; - let cubing_input = state[active] + addition_buffer + self.constants[r].into(); + let cubing_input = state[active] + addition_buffer + self.constants[r]; let cubing_input_wire = vars.local_wires[Self::wire_cubing_input(r)]; constraints.push(cubing_input - cubing_input_wire); let f = cubing_input_wire.cube(); @@ -160,8 +160,6 @@ impl, const D: usize, const R: usize> Gate for GMiMCGate< builder: &mut CircuitBuilder, vars: EvaluationTargets, ) -> Vec> { - let one = builder.one_extension(); - let neg_one = builder.neg_one_extension(); let mut constraints = Vec::with_capacity(self.num_constraints()); let swap = vars.local_wires[Self::WIRE_SWAP]; diff --git a/src/iop/generator.rs b/src/iop/generator.rs index 189648c5..17567a4c 100644 --- a/src/iop/generator.rs +++ b/src/iop/generator.rs @@ -1,4 +1,3 @@ -use std::convert::identity; use std::fmt::Debug; use crate::field::extension_field::target::ExtensionTarget; @@ -75,11 +74,6 @@ pub(crate) fn generate_partial_witness( pending_generator_indices = next_pending_generator_indices; } - - // assert!( - // generator_is_expired.into_iter().all(identity), - // "Some generators weren't run." - // ); } /// A generator participates in the generation of the witness. diff --git a/src/plonk/recursive_verifier.rs b/src/plonk/recursive_verifier.rs index 66c1ec6f..6789d114 100644 --- a/src/plonk/recursive_verifier.rs +++ b/src/plonk/recursive_verifier.rs @@ -37,7 +37,7 @@ impl, const D: usize> CircuitBuilder { self.constants(&inner_common_data.circuit_digest.elements), ); challenger.observe_hash(&digest); - challenger.observe_hash(&public_inputs_hash); + challenger.observe_hash(public_inputs_hash); challenger.observe_cap(&proof.wires_cap); let betas = challenger.get_n_challenges(self, num_challenges); diff --git a/src/plonk/vanishing_poly.rs b/src/plonk/vanishing_poly.rs index 73acab42..6a282be9 100644 --- a/src/plonk/vanishing_poly.rs +++ b/src/plonk/vanishing_poly.rs @@ -1,5 +1,3 @@ -use num::Integer; - use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; use crate::field::field_types::Field; diff --git a/src/util/reducing.rs b/src/util/reducing.rs index 863f3246..ca0dd9e8 100644 --- a/src/util/reducing.rs +++ b/src/util/reducing.rs @@ -1,11 +1,8 @@ use std::borrow::Borrow; -use num::Integer; - use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::{Extendable, Frobenius}; use crate::field::field_types::Field; -use crate::gates::arithmetic::ArithmeticExtensionGate; use crate::gates::reducing::ReducingGate; use crate::iop::target::Target; use crate::plonk::circuit_builder::CircuitBuilder;