From c78d7611ed5b1a9d34de77ee9ea0e97c7146d98e Mon Sep 17 00:00:00 2001 From: wborgeaud Date: Fri, 5 Nov 2021 16:47:29 +0100 Subject: [PATCH] Unused imports --- src/bin/bench_recursion.rs | 3 --- src/field/extension_field/target.rs | 2 +- src/fri/commitment.rs | 2 +- src/gadgets/arithmetic.rs | 1 - src/gadgets/arithmetic_extension.rs | 2 +- src/gadgets/interpolation.rs | 1 - src/gadgets/permutation.rs | 1 - src/gadgets/polynomial.rs | 1 - src/gadgets/random_access.rs | 1 - src/gadgets/select.rs | 1 - src/gadgets/sorting.rs | 2 +- src/gadgets/split_base.rs | 2 +- src/gates/arithmetic.rs | 1 - src/gates/arithmetic_u32.rs | 2 +- src/gates/comparison.rs | 2 +- src/gates/constant.rs | 2 +- src/gates/exponentiation.rs | 2 +- src/gates/gmimc.rs | 2 +- src/gates/interpolation.rs | 1 - src/gates/noop.rs | 1 - src/gates/poseidon_mds.rs | 2 +- src/gates/public_input.rs | 1 - src/gates/random_access.rs | 2 +- src/gates/switch.rs | 2 +- src/hash/poseidon.rs | 2 +- src/plonk/circuit_builder.rs | 2 +- src/plonk/proof.rs | 1 - src/plonk/vanishing_poly.rs | 2 +- src/util/partial_products.rs | 1 - src/util/reducing.rs | 2 +- 30 files changed, 17 insertions(+), 32 deletions(-) diff --git a/src/bin/bench_recursion.rs b/src/bin/bench_recursion.rs index ee602731..e1470790 100644 --- a/src/bin/bench_recursion.rs +++ b/src/bin/bench_recursion.rs @@ -1,9 +1,6 @@ use anyhow::Result; use env_logger::Env; use log::info; -use plonky2::field::extension_field::Extendable; -use plonky2::field::field_types::RichField; -use plonky2::field::goldilocks_field::GoldilocksField; use plonky2::fri::reduction_strategies::FriReductionStrategy; use plonky2::fri::FriConfig; use plonky2::hash::hashing::SPONGE_WIDTH; diff --git a/src/field/extension_field/target.rs b/src/field/extension_field/target.rs index 216ef1e6..d92d3c3f 100644 --- a/src/field/extension_field/target.rs +++ b/src/field/extension_field/target.rs @@ -3,7 +3,7 @@ use std::ops::Range; use crate::field::extension_field::algebra::ExtensionAlgebra; use crate::field::extension_field::{Extendable, FieldExtension, OEF}; -use crate::field::field_types::{Field, RichField}; +use crate::field::field_types::Field; use crate::iop::target::Target; use crate::plonk::circuit_builder::CircuitBuilder; diff --git a/src/fri/commitment.rs b/src/fri/commitment.rs index 64643283..195d082b 100644 --- a/src/fri/commitment.rs +++ b/src/fri/commitment.rs @@ -210,7 +210,7 @@ impl, C: GenericConfig, const D: usize> let fri_proof = fri_proof( &commitments - .iter() + .par_iter() .map(|c| &c.merkle_tree) .collect::>(), lde_final_poly, diff --git a/src/gadgets/arithmetic.rs b/src/gadgets/arithmetic.rs index 63c17f32..c043afdd 100644 --- a/src/gadgets/arithmetic.rs +++ b/src/gadgets/arithmetic.rs @@ -1,7 +1,6 @@ use std::borrow::Borrow; use crate::field::extension_field::Extendable; -use crate::field::field_types::RichField; use crate::gates::exponentiation::ExponentiationGate; use crate::iop::target::{BoolTarget, Target}; use crate::plonk::circuit_builder::CircuitBuilder; diff --git a/src/gadgets/arithmetic_extension.rs b/src/gadgets/arithmetic_extension.rs index e9fbfb5c..cf62b9dd 100644 --- a/src/gadgets/arithmetic_extension.rs +++ b/src/gadgets/arithmetic_extension.rs @@ -3,7 +3,7 @@ use std::convert::TryInto; use crate::field::extension_field::target::{ExtensionAlgebraTarget, ExtensionTarget}; use crate::field::extension_field::FieldExtension; use crate::field::extension_field::{Extendable, OEF}; -use crate::field::field_types::{Field, PrimeField, RichField}; +use crate::field::field_types::{Field, PrimeField}; use crate::gates::arithmetic::ArithmeticExtensionGate; use crate::iop::generator::{GeneratedValues, SimpleGenerator}; use crate::iop::target::Target; diff --git a/src/gadgets/interpolation.rs b/src/gadgets/interpolation.rs index cc743ce3..727399c6 100644 --- a/src/gadgets/interpolation.rs +++ b/src/gadgets/interpolation.rs @@ -1,6 +1,5 @@ use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::field::field_types::RichField; use crate::gates::interpolation::InterpolationGate; use crate::iop::target::Target; use crate::plonk::circuit_builder::CircuitBuilder; diff --git a/src/gadgets/permutation.rs b/src/gadgets/permutation.rs index e65708ca..644e17a7 100644 --- a/src/gadgets/permutation.rs +++ b/src/gadgets/permutation.rs @@ -1,7 +1,6 @@ use std::collections::BTreeMap; use std::marker::PhantomData; -use crate::field::field_types::RichField; use crate::field::{extension_field::Extendable, field_types::Field}; use crate::gates::switch::SwitchGate; use crate::iop::generator::{GeneratedValues, SimpleGenerator}; diff --git a/src/gadgets/polynomial.rs b/src/gadgets/polynomial.rs index 8acc1587..3d371c53 100644 --- a/src/gadgets/polynomial.rs +++ b/src/gadgets/polynomial.rs @@ -1,6 +1,5 @@ use crate::field::extension_field::target::{ExtensionAlgebraTarget, ExtensionTarget}; use crate::field::extension_field::Extendable; -use crate::field::field_types::RichField; use crate::iop::target::Target; use crate::plonk::circuit_builder::CircuitBuilder; use crate::util::reducing::ReducingFactorTarget; diff --git a/src/gadgets/random_access.rs b/src/gadgets/random_access.rs index 02620e9d..50f3ac76 100644 --- a/src/gadgets/random_access.rs +++ b/src/gadgets/random_access.rs @@ -1,6 +1,5 @@ use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::field::field_types::RichField; use crate::gates::random_access::RandomAccessGate; use crate::iop::target::Target; use crate::plonk::circuit_builder::CircuitBuilder; diff --git a/src/gadgets/select.rs b/src/gadgets/select.rs index 25372783..80b5073e 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::field::field_types::RichField; use crate::iop::target::{BoolTarget, Target}; use crate::plonk::circuit_builder::CircuitBuilder; diff --git a/src/gadgets/sorting.rs b/src/gadgets/sorting.rs index 619dfdb8..95560f92 100644 --- a/src/gadgets/sorting.rs +++ b/src/gadgets/sorting.rs @@ -3,7 +3,7 @@ use std::marker::PhantomData; use itertools::izip; use crate::field::extension_field::Extendable; -use crate::field::field_types::{Field, RichField}; +use crate::field::field_types::Field; use crate::gates::comparison::ComparisonGate; use crate::iop::generator::{GeneratedValues, SimpleGenerator}; use crate::iop::target::{BoolTarget, Target}; diff --git a/src/gadgets/split_base.rs b/src/gadgets/split_base.rs index 7a4bf967..e35a0d20 100644 --- a/src/gadgets/split_base.rs +++ b/src/gadgets/split_base.rs @@ -1,7 +1,7 @@ use std::borrow::Borrow; use crate::field::extension_field::Extendable; -use crate::field::field_types::{Field, RichField}; +use crate::field::field_types::Field; use crate::gates::base_sum::BaseSumGate; use crate::iop::generator::{GeneratedValues, SimpleGenerator}; use crate::iop::target::{BoolTarget, Target}; diff --git a/src/gates/arithmetic.rs b/src/gates/arithmetic.rs index d3fa1fed..2898c596 100644 --- a/src/gates/arithmetic.rs +++ b/src/gates/arithmetic.rs @@ -3,7 +3,6 @@ use std::ops::Range; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; use crate::field::extension_field::FieldExtension; -use crate::field::field_types::RichField; use crate::gates::gate::Gate; use crate::iop::generator::{GeneratedValues, SimpleGenerator, WitnessGenerator}; use crate::iop::target::Target; diff --git a/src/gates/arithmetic_u32.rs b/src/gates/arithmetic_u32.rs index 3c333635..220c2dd0 100644 --- a/src/gates/arithmetic_u32.rs +++ b/src/gates/arithmetic_u32.rs @@ -4,7 +4,7 @@ use itertools::unfold; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::field::field_types::{Field, RichField}; +use crate::field::field_types::Field; use crate::gates::gate::Gate; use crate::iop::generator::{GeneratedValues, SimpleGenerator, WitnessGenerator}; use crate::iop::target::Target; diff --git a/src/gates/comparison.rs b/src/gates/comparison.rs index 2cb6458e..bb2d813c 100644 --- a/src/gates/comparison.rs +++ b/src/gates/comparison.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::field::field_types::{Field, PrimeField, RichField}; +use crate::field::field_types::{Field, PrimeField}; use crate::gates::gate::Gate; use crate::iop::generator::{GeneratedValues, SimpleGenerator, WitnessGenerator}; use crate::iop::target::Target; diff --git a/src/gates/constant.rs b/src/gates/constant.rs index 1c36c73d..ee3f4545 100644 --- a/src/gates/constant.rs +++ b/src/gates/constant.rs @@ -2,7 +2,7 @@ use std::ops::Range; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::field::field_types::{Field, RichField}; +use crate::field::field_types::Field; use crate::gates::gate::Gate; use crate::iop::generator::{GeneratedValues, SimpleGenerator, WitnessGenerator}; use crate::iop::target::Target; diff --git a/src/gates/exponentiation.rs b/src/gates/exponentiation.rs index bfb8ccba..8bb3e593 100644 --- a/src/gates/exponentiation.rs +++ b/src/gates/exponentiation.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::field::field_types::{Field, RichField}; +use crate::field::field_types::Field; use crate::gates::gate::Gate; use crate::iop::generator::{GeneratedValues, SimpleGenerator, WitnessGenerator}; use crate::iop::target::Target; diff --git a/src/gates/gmimc.rs b/src/gates/gmimc.rs index cdeba9e3..a88704c1 100644 --- a/src/gates/gmimc.rs +++ b/src/gates/gmimc.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::field::field_types::{Field, RichField}; +use crate::field::field_types::Field; use crate::gates::gate::Gate; use crate::hash::gmimc; use crate::hash::gmimc::GMiMC; diff --git a/src/gates/interpolation.rs b/src/gates/interpolation.rs index ebd58464..9abd4784 100644 --- a/src/gates/interpolation.rs +++ b/src/gates/interpolation.rs @@ -5,7 +5,6 @@ use std::ops::Range; use crate::field::extension_field::algebra::PolynomialCoeffsAlgebra; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::{Extendable, FieldExtension}; -use crate::field::field_types::RichField; use crate::field::interpolation::interpolant; use crate::gadgets::polynomial::PolynomialCoeffsExtAlgebraTarget; use crate::gates::gate::Gate; diff --git a/src/gates/noop.rs b/src/gates/noop.rs index 15549f4a..a1f572d8 100644 --- a/src/gates/noop.rs +++ b/src/gates/noop.rs @@ -1,6 +1,5 @@ use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::field::field_types::RichField; use crate::gates::gate::Gate; use crate::iop::generator::WitnessGenerator; use crate::plonk::circuit_builder::CircuitBuilder; diff --git a/src/gates/poseidon_mds.rs b/src/gates/poseidon_mds.rs index 3af6d116..38d0dd0e 100644 --- a/src/gates/poseidon_mds.rs +++ b/src/gates/poseidon_mds.rs @@ -6,7 +6,7 @@ use crate::field::extension_field::algebra::ExtensionAlgebra; use crate::field::extension_field::target::{ExtensionAlgebraTarget, ExtensionTarget}; use crate::field::extension_field::Extendable; use crate::field::extension_field::FieldExtension; -use crate::field::field_types::{Field, RichField}; +use crate::field::field_types::Field; use crate::gates::gate::Gate; use crate::hash::hashing::SPONGE_WIDTH; use crate::hash::poseidon::Poseidon; diff --git a/src/gates/public_input.rs b/src/gates/public_input.rs index 84783c9b..7447cd1d 100644 --- a/src/gates/public_input.rs +++ b/src/gates/public_input.rs @@ -2,7 +2,6 @@ use std::ops::Range; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::field::field_types::RichField; use crate::gates::gate::Gate; use crate::iop::generator::WitnessGenerator; use crate::plonk::circuit_builder::CircuitBuilder; diff --git a/src/gates/random_access.rs b/src/gates/random_access.rs index 394a3375..d29cbed6 100644 --- a/src/gates/random_access.rs +++ b/src/gates/random_access.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::field::field_types::{Field, RichField}; +use crate::field::field_types::Field; use crate::gates::gate::Gate; use crate::iop::generator::{GeneratedValues, SimpleGenerator, WitnessGenerator}; use crate::iop::target::Target; diff --git a/src/gates/switch.rs b/src/gates/switch.rs index f4971369..be14e76e 100644 --- a/src/gates/switch.rs +++ b/src/gates/switch.rs @@ -4,7 +4,7 @@ use array_tool::vec::Union; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::field::field_types::{Field, RichField}; +use crate::field::field_types::Field; use crate::gates::gate::Gate; use crate::iop::generator::{GeneratedValues, WitnessGenerator}; use crate::iop::target::Target; diff --git a/src/hash/poseidon.rs b/src/hash/poseidon.rs index 76305708..6ac41fcb 100644 --- a/src/hash/poseidon.rs +++ b/src/hash/poseidon.rs @@ -7,7 +7,7 @@ use unroll::unroll_for_loops; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::{Extendable, FieldExtension}; -use crate::field::field_types::{Field, PrimeField, RichField}; +use crate::field::field_types::{Field, PrimeField}; use crate::gates::gate::Gate; use crate::gates::poseidon_mds::PoseidonMdsGate; use crate::hash::hashing::SPONGE_WIDTH; diff --git a/src/plonk/circuit_builder.rs b/src/plonk/circuit_builder.rs index b9e42afb..b9533c3e 100644 --- a/src/plonk/circuit_builder.rs +++ b/src/plonk/circuit_builder.rs @@ -9,7 +9,7 @@ use crate::field::cosets::get_unique_coset_shifts; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::{Extendable, FieldExtension}; use crate::field::fft::fft_root_table; -use crate::field::field_types::{Field, RichField}; +use crate::field::field_types::Field; use crate::fri::commitment::PolynomialBatchCommitment; use crate::fri::{FriConfig, FriParams}; use crate::gadgets::arithmetic_extension::ArithmeticOperation; diff --git a/src/plonk/proof.rs b/src/plonk/proof.rs index df4a25ff..72c13f50 100644 --- a/src/plonk/proof.rs +++ b/src/plonk/proof.rs @@ -3,7 +3,6 @@ use serde::{Deserialize, Serialize}; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::field::field_types::RichField; use crate::fri::commitment::PolynomialBatchCommitment; use crate::fri::proof::{CompressedFriProof, FriProof, FriProofTarget}; use crate::hash::hash_types::MerkleCapTarget; diff --git a/src/plonk/vanishing_poly.rs b/src/plonk/vanishing_poly.rs index 8a89e449..b16c8396 100644 --- a/src/plonk/vanishing_poly.rs +++ b/src/plonk/vanishing_poly.rs @@ -1,6 +1,6 @@ use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::{Extendable, FieldExtension}; -use crate::field::field_types::{Field, RichField}; +use crate::field::field_types::Field; use crate::gates::gate::PrefixedGate; use crate::iop::target::Target; use crate::plonk::circuit_builder::CircuitBuilder; diff --git a/src/util/partial_products.rs b/src/util/partial_products.rs index c687342c..432fb5c2 100644 --- a/src/util/partial_products.rs +++ b/src/util/partial_products.rs @@ -3,7 +3,6 @@ use std::ops::Sub; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::field::field_types::RichField; use crate::plonk::circuit_builder::CircuitBuilder; use crate::util::ceil_div_usize; diff --git a/src/util/reducing.rs b/src/util/reducing.rs index 1ae694c8..28acc1b0 100644 --- a/src/util/reducing.rs +++ b/src/util/reducing.rs @@ -2,7 +2,7 @@ use std::borrow::Borrow; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::field::field_types::{Field, RichField}; +use crate::field::field_types::Field; use crate::gates::reducing::ReducingGate; use crate::iop::target::Target; use crate::plonk::circuit_builder::CircuitBuilder;