From 3d74abba8a27733162fa40dac10a140a0f694319 Mon Sep 17 00:00:00 2001 From: wborgeaud Date: Fri, 5 Nov 2021 15:31:24 +0100 Subject: [PATCH] [skip-ci]Clippy --- src/gadgets/arithmetic_extension.rs | 1 - src/gadgets/hash.rs | 7 ------- src/gadgets/insert.rs | 2 -- src/gadgets/interpolation.rs | 2 -- src/gadgets/permutation.rs | 1 - src/gadgets/random_access.rs | 2 -- src/gadgets/select.rs | 2 -- src/gadgets/sorting.rs | 1 - src/gadgets/split_base.rs | 1 - src/gates/gate_tree.rs | 1 - src/gates/interpolation.rs | 1 - src/gates/random_access.rs | 1 - src/hash/merkle_proofs.rs | 1 - src/hash/merkle_tree.rs | 1 - src/hash/path_compression.rs | 1 - src/iop/challenger.rs | 3 +-- src/plonk/config.rs | 4 +--- src/plonk/proof.rs | 7 +------ src/util/reducing.rs | 2 -- 19 files changed, 3 insertions(+), 38 deletions(-) diff --git a/src/gadgets/arithmetic_extension.rs b/src/gadgets/arithmetic_extension.rs index 8231f204..e963df00 100644 --- a/src/gadgets/arithmetic_extension.rs +++ b/src/gadgets/arithmetic_extension.rs @@ -564,7 +564,6 @@ mod tests { use crate::field::extension_field::algebra::ExtensionAlgebra; use crate::field::field_types::Field; - use crate::field::goldilocks_field::GoldilocksField; use crate::iop::witness::{PartialWitness, Witness}; use crate::plonk::circuit_builder::CircuitBuilder; use crate::plonk::circuit_data::CircuitConfig; diff --git a/src/gadgets/hash.rs b/src/gadgets/hash.rs index 931b0f3a..5ec47323 100644 --- a/src/gadgets/hash.rs +++ b/src/gadgets/hash.rs @@ -1,14 +1,7 @@ -use std::convert::TryInto; - use crate::field::extension_field::Extendable; use crate::field::field_types::RichField; -use crate::gates::gmimc::GMiMCGate; -use crate::gates::poseidon::PoseidonGate; -use crate::hash::gmimc::GMiMC; use crate::hash::hashing::SPONGE_WIDTH; -use crate::hash::poseidon::Poseidon; use crate::iop::target::{BoolTarget, Target}; -use crate::iop::wire::Wire; use crate::plonk::circuit_builder::CircuitBuilder; use crate::plonk::config::AlgebraicHasher; diff --git a/src/gadgets/insert.rs b/src/gadgets/insert.rs index 77ecca3c..5fc5fd48 100644 --- a/src/gadgets/insert.rs +++ b/src/gadgets/insert.rs @@ -43,9 +43,7 @@ mod tests { use anyhow::Result; use super::*; - use crate::field::extension_field::quadratic::QuadraticExtension; use crate::field::field_types::Field; - use crate::field::goldilocks_field::GoldilocksField; use crate::iop::witness::PartialWitness; use crate::plonk::circuit_data::CircuitConfig; use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; diff --git a/src/gadgets/interpolation.rs b/src/gadgets/interpolation.rs index 2e364da0..89bf115c 100644 --- a/src/gadgets/interpolation.rs +++ b/src/gadgets/interpolation.rs @@ -35,10 +35,8 @@ impl, const D: usize> CircuitBuilder { mod tests { use anyhow::Result; - use crate::field::extension_field::quartic::QuarticExtension; use crate::field::extension_field::FieldExtension; use crate::field::field_types::Field; - use crate::field::goldilocks_field::GoldilocksField; use crate::field::interpolation::interpolant; use crate::iop::witness::PartialWitness; use crate::plonk::circuit_builder::CircuitBuilder; diff --git a/src/gadgets/permutation.rs b/src/gadgets/permutation.rs index 52069bfb..22fb097d 100644 --- a/src/gadgets/permutation.rs +++ b/src/gadgets/permutation.rs @@ -388,7 +388,6 @@ mod tests { use super::*; use crate::field::field_types::Field; - use crate::field::goldilocks_field::GoldilocksField; use crate::iop::witness::PartialWitness; use crate::plonk::circuit_data::CircuitConfig; use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; diff --git a/src/gadgets/random_access.rs b/src/gadgets/random_access.rs index c7c7b8bf..3744a90a 100644 --- a/src/gadgets/random_access.rs +++ b/src/gadgets/random_access.rs @@ -87,9 +87,7 @@ mod tests { use anyhow::Result; use super::*; - use crate::field::extension_field::quartic::QuarticExtension; use crate::field::field_types::Field; - use crate::field::goldilocks_field::GoldilocksField; use crate::iop::witness::PartialWitness; use crate::plonk::circuit_data::CircuitConfig; use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; diff --git a/src/gadgets/select.rs b/src/gadgets/select.rs index 4fa98347..73004ffc 100644 --- a/src/gadgets/select.rs +++ b/src/gadgets/select.rs @@ -41,9 +41,7 @@ impl, const D: usize> CircuitBuilder { mod tests { use anyhow::Result; - use crate::field::extension_field::quartic::QuarticExtension; use crate::field::field_types::Field; - use crate::field::goldilocks_field::GoldilocksField; use crate::iop::witness::{PartialWitness, Witness}; use crate::plonk::circuit_builder::CircuitBuilder; use crate::plonk::circuit_data::CircuitConfig; diff --git a/src/gadgets/sorting.rs b/src/gadgets/sorting.rs index e283d983..c1c98c78 100644 --- a/src/gadgets/sorting.rs +++ b/src/gadgets/sorting.rs @@ -177,7 +177,6 @@ mod tests { use super::*; use crate::field::field_types::{Field, PrimeField}; - use crate::field::goldilocks_field::GoldilocksField; use crate::iop::witness::PartialWitness; use crate::plonk::circuit_data::CircuitConfig; use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; diff --git a/src/gadgets/split_base.rs b/src/gadgets/split_base.rs index 524ed46f..17ec263d 100644 --- a/src/gadgets/split_base.rs +++ b/src/gadgets/split_base.rs @@ -103,7 +103,6 @@ mod tests { use rand::{thread_rng, Rng}; use crate::field::field_types::Field; - use crate::field::goldilocks_field::GoldilocksField; use crate::iop::witness::PartialWitness; use crate::plonk::circuit_builder::CircuitBuilder; use crate::plonk::circuit_data::CircuitConfig; diff --git a/src/gates/gate_tree.rs b/src/gates/gate_tree.rs index edcae822..c5889806 100644 --- a/src/gates/gate_tree.rs +++ b/src/gates/gate_tree.rs @@ -222,7 +222,6 @@ impl, const D: usize> Tree> { #[cfg(test)] mod tests { use super::*; - use crate::field::goldilocks_field::GoldilocksField; use crate::gates::arithmetic::ArithmeticExtensionGate; use crate::gates::base_sum::BaseSumGate; use crate::gates::constant::ConstantGate; diff --git a/src/gates/interpolation.rs b/src/gates/interpolation.rs index dd672067..63f10326 100644 --- a/src/gates/interpolation.rs +++ b/src/gates/interpolation.rs @@ -295,7 +295,6 @@ mod tests { use anyhow::Result; - use crate::field::extension_field::quartic::QuarticExtension; use crate::field::field_types::Field; use crate::field::goldilocks_field::GoldilocksField; use crate::gates::gate::Gate; diff --git a/src/gates/random_access.rs b/src/gates/random_access.rs index 452fcf35..8fa7092b 100644 --- a/src/gates/random_access.rs +++ b/src/gates/random_access.rs @@ -292,7 +292,6 @@ mod tests { use anyhow::Result; use rand::{thread_rng, Rng}; - use crate::field::extension_field::quartic::QuarticExtension; use crate::field::field_types::Field; use crate::field::goldilocks_field::GoldilocksField; use crate::gates::gate::Gate; diff --git a/src/hash/merkle_proofs.rs b/src/hash/merkle_proofs.rs index 38105d2c..37dfdce6 100644 --- a/src/hash/merkle_proofs.rs +++ b/src/hash/merkle_proofs.rs @@ -130,7 +130,6 @@ mod tests { use super::*; use crate::field::field_types::Field; - use crate::field::goldilocks_field::GoldilocksField; use crate::hash::merkle_tree::MerkleTree; use crate::iop::witness::{PartialWitness, Witness}; use crate::plonk::circuit_builder::CircuitBuilder; diff --git a/src/hash/merkle_tree.rs b/src/hash/merkle_tree.rs index cb80fcdc..26a318e3 100644 --- a/src/hash/merkle_tree.rs +++ b/src/hash/merkle_tree.rs @@ -89,7 +89,6 @@ mod tests { use super::*; use crate::field::extension_field::Extendable; - use crate::field::goldilocks_field::GoldilocksField; use crate::hash::merkle_proofs::verify_merkle_proof; use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; diff --git a/src/hash/path_compression.rs b/src/hash/path_compression.rs index a18fbefb..7ecbeb24 100644 --- a/src/hash/path_compression.rs +++ b/src/hash/path_compression.rs @@ -116,7 +116,6 @@ mod tests { use super::*; use crate::field::field_types::Field; - use crate::field::goldilocks_field::GoldilocksField; use crate::hash::merkle_tree::MerkleTree; use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; diff --git a/src/iop/challenger.rs b/src/iop/challenger.rs index 1a838b39..1e2cd293 100644 --- a/src/iop/challenger.rs +++ b/src/iop/challenger.rs @@ -9,7 +9,7 @@ use crate::hash::hashing::{PlonkyPermutation, SPONGE_RATE, SPONGE_WIDTH}; use crate::hash::merkle_tree::MerkleCap; use crate::iop::target::Target; use crate::plonk::circuit_builder::CircuitBuilder; -use crate::plonk::config::{AlgebraicHasher, GenericConfig, Hasher}; +use crate::plonk::config::{AlgebraicHasher, Hasher}; use crate::plonk::proof::{OpeningSet, OpeningSetTarget}; /// Observes prover messages, and generates challenges by hashing the transcript, a la Fiat-Shamir. @@ -322,7 +322,6 @@ impl, H: AlgebraicHasher, const D: usize> RecursiveChallenge #[cfg(test)] mod tests { use crate::field::field_types::Field; - use crate::field::goldilocks_field::GoldilocksField; use crate::iop::challenger::{Challenger, RecursiveChallenger}; use crate::iop::generator::generate_partial_witness; use crate::iop::target::Target; diff --git a/src/plonk/config.rs b/src/plonk/config.rs index 771a3ce7..3cc82639 100644 --- a/src/plonk/config.rs +++ b/src/plonk/config.rs @@ -2,8 +2,7 @@ use std::convert::TryInto; use std::fmt::Debug; use keccak_hash::keccak; -use serde::de::DeserializeOwned; -use serde::{Deserialize, Deserializer, Serialize, Serializer}; +use serde::{de::DeserializeOwned, Serialize}; use crate::field::extension_field::quadratic::QuadraticExtension; use crate::field::extension_field::{Extendable, FieldExtension}; @@ -16,7 +15,6 @@ use crate::hash::hashing::{ }; use crate::iop::target::{BoolTarget, Target}; use crate::plonk::circuit_builder::CircuitBuilder; -use crate::util::ceil_div_usize; use crate::util::serialization::Buffer; /// Trait for hash functions. diff --git a/src/plonk/proof.rs b/src/plonk/proof.rs index 0dff5a06..2f9bcb4b 100644 --- a/src/plonk/proof.rs +++ b/src/plonk/proof.rs @@ -140,11 +140,7 @@ impl, C: GenericConfig, const D: usize> CompressedPro plonk_zs_partial_products_cap, quotient_polys_cap, openings, - opening_proof: opening_proof.decompress( - &challenges, - fri_inferred_elements, - common_data, - ), + opening_proof: opening_proof.decompress(challenges, fri_inferred_elements, common_data), } } } @@ -318,7 +314,6 @@ mod tests { use anyhow::Result; use crate::field::field_types::Field; - use crate::field::goldilocks_field::GoldilocksField; use crate::fri::reduction_strategies::FriReductionStrategy; use crate::iop::witness::PartialWitness; use crate::plonk::circuit_builder::CircuitBuilder; diff --git a/src/util/reducing.rs b/src/util/reducing.rs index 89c02b51..6aa7c2b3 100644 --- a/src/util/reducing.rs +++ b/src/util/reducing.rs @@ -181,8 +181,6 @@ mod tests { use anyhow::Result; use super::*; - use crate::field::extension_field::quartic::QuarticExtension; - use crate::field::goldilocks_field::GoldilocksField; use crate::iop::witness::PartialWitness; use crate::plonk::circuit_data::CircuitConfig; use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};