chore: clippy

succinctlabs · Mar 5, 2024 · daceb64 · daceb64
1 parent 0010b48
commit daceb64
Show file tree

Hide file tree

Showing 42 changed files with 9 additions and 71 deletions.
diff --git a/plonky2x/core/src/backend/circuit/build.rs b/plonky2x/core/src/backend/circuit/build.rs
@@ -298,11 +298,7 @@ impl<L: PlonkParameters<D>, const D: usize> CircuitBuild<L, D> {
 #[cfg(test)]
 pub(crate) mod tests {
 
-    use plonky2::field::types::Field;
-
-    use crate::backend::circuit::serialization::{GateRegistry, HintRegistry};
     use crate::backend::circuit::CircuitBuild;
-    use crate::frontend::builder::DefaultBuilder;
     use crate::prelude::*;
 
     type L = DefaultParameters;

diff --git a/plonky2x/core/src/backend/circuit/mock.rs b/plonky2x/core/src/backend/circuit/mock.rs
@@ -65,7 +65,6 @@ impl<L: PlonkParameters<D>, const D: usize> MockCircuitBuild<L, D> {
 pub(crate) mod tests {
 
     use log::debug;
-    use plonky2::field::types::Field;
 
     use crate::prelude::*;
     use crate::utils;

diff --git a/plonky2x/core/src/backend/function/mod.rs b/plonky2x/core/src/backend/function/mod.rs
@@ -18,7 +18,7 @@ use crate::backend::circuit::*;
 use crate::backend::function::args::{Args, Commands};
 use crate::backend::wrapper::wrap::WrappedCircuit;
 use crate::frontend::builder::CircuitIO;
-use crate::prelude::{CircuitBuilder, GateRegistry, HintRegistry};
+use crate::prelude::CircuitBuilder;
 
 /// `Plonky2xFunction`s have all necessary code for a circuit to be deployed end-to-end.
 pub trait Plonky2xFunction {

diff --git a/plonky2x/core/src/backend/wrapper/wrap.rs b/plonky2x/core/src/backend/wrapper/wrap.rs
@@ -255,7 +255,6 @@ impl<L: PlonkParameters<D>, const D: usize> WrappedOutput<L, D> {
 mod tests {
     use super::*;
     use crate::backend::circuit::{DefaultParameters, Groth16WrapperParameters};
-    use crate::frontend::builder::CircuitBuilder;
     use crate::utils;
 
     #[test]

diff --git a/plonky2x/core/src/frontend/builder/mod.rs b/plonky2x/core/src/frontend/builder/mod.rs
@@ -410,9 +410,7 @@ impl<L: PlonkParameters<D>, const D: usize> Default for CircuitBuilder<L, D> {
 pub(crate) mod tests {
 
     use log::debug;
-    use plonky2::field::types::Field;
 
-    use super::DefaultBuilder;
     use crate::prelude::*;
     use crate::utils;
 

diff --git a/plonky2x/core/src/frontend/builder/permutation.rs b/plonky2x/core/src/frontend/builder/permutation.rs
@@ -124,10 +124,7 @@ impl<L: PlonkParameters<D>, const D: usize> CircuitBuilder<L, D> {
 #[cfg(test)]
 pub(crate) mod tests {
 
-    use plonky2::field::types::Field;
-
     use crate::frontend::extension::CubicExtensionVariable;
-    use crate::frontend::uint::uint32::U32Variable;
     use crate::prelude::*;
     use crate::utils;
 

diff --git a/plonky2x/core/src/frontend/builder/watch.rs b/plonky2x/core/src/frontend/builder/watch.rs
@@ -186,9 +186,7 @@ impl<L: PlonkParameters<D>, V: CircuitVariable, const D: usize> SimpleGenerator<
 #[cfg(test)]
 mod tests {
     use log::{debug, Level};
-    use plonky2::field::types::Field;
 
-    use crate::frontend::builder::DefaultBuilder;
     use crate::prelude::*;
     use crate::utils;
 

diff --git a/plonky2x/core/src/frontend/curta/builder.rs b/plonky2x/core/src/frontend/curta/builder.rs
@@ -57,7 +57,6 @@ impl<L: PlonkParameters<D>, const D: usize> CircuitBuilder<L, D> {
 
 #[cfg(test)]
 mod tests {
-    use plonky2::field::goldilocks_field::GoldilocksField;
     use plonky2::util::timing::TimingTree;
     use serde::{Deserialize, Serialize};
     use starkyx::chip::memory::time::Time;

diff --git a/plonky2x/core/src/frontend/curta/proof.rs b/plonky2x/core/src/frontend/curta/proof.rs
@@ -728,7 +728,6 @@ mod tests {
     use starkyx::chip::register::element::ElementRegister;
     use starkyx::chip::register::{Register, RegisterSerializable};
     use starkyx::chip::trace::generator::ArithmeticGenerator;
-    use starkyx::chip::AirParameters;
     use starkyx::math::goldilocks::cubic::GoldilocksCubicParameters;
     use starkyx::plonky2::stark::config::{
         CurtaPoseidonGoldilocksConfig, PoseidonGoldilocksStarkConfig,

diff --git a/plonky2x/core/src/frontend/eth/beacon/vars/header.rs b/plonky2x/core/src/frontend/eth/beacon/vars/header.rs
@@ -81,7 +81,7 @@ mod test {
     use ethers::types::U64;
 
     use super::*;
-    use crate::prelude::{CircuitBuilder, DefaultParameters, PlonkParameters};
+    use crate::prelude::DefaultParameters;
     use crate::utils::eth::beacon::BeaconClient;
 
     type L = DefaultParameters;

diff --git a/plonky2x/core/src/frontend/eth/mpt/reference.rs b/plonky2x/core/src/frontend/eth/mpt/reference.rs
@@ -144,7 +144,7 @@ mod tests {
     use ethers::types::Bytes;
 
     use super::super::utils::{read_fixture, EIP1186ProofResponse};
-    use super::{get, *};
+    use super::*;
     use crate::frontend::eth::utils::u256_to_h256_be;
     use crate::utils::bytes32;
 

diff --git a/plonky2x/core/src/frontend/hash/blake2/curta.rs b/plonky2x/core/src/frontend/hash/blake2/curta.rs
@@ -13,11 +13,10 @@ use starkyx::machine::hash::blake::blake2b::pure::BLAKE2BPure;
 use starkyx::machine::hash::blake::blake2b::utils::BLAKE2BUtil;
 use starkyx::machine::hash::blake::blake2b::BLAKE2B;
 
-use crate::backend::circuit::PlonkParameters;
 use crate::frontend::hash::curta::accelerator::HashAccelerator;
 use crate::frontend::hash::curta::request::HashRequest;
 use crate::frontend::hash::curta::Hash;
-use crate::frontend::vars::{Bytes32Variable, EvmVariable};
+use crate::frontend::vars::EvmVariable;
 use crate::prelude::*;
 
 pub type BLAKE2BAccelerator = HashAccelerator<U64Variable, 4>;

diff --git a/plonky2x/core/src/frontend/hash/keccak/mod.rs b/plonky2x/core/src/frontend/hash/keccak/mod.rs
@@ -47,7 +47,6 @@ mod tests {
 
     use super::*;
     use crate::backend::circuit::DefaultParameters;
-    use crate::prelude::CircuitBuilder;
     use crate::utils::bytes32;
 
     type L = DefaultParameters;

diff --git a/plonky2x/core/src/frontend/hash/sha/sha256/curta.rs b/plonky2x/core/src/frontend/hash/sha/sha256/curta.rs
@@ -200,8 +200,7 @@ mod tests {
     use ethers::types::H256;
     use rand::{thread_rng, Rng};
 
-    use crate::backend::circuit::{CircuitBuild, DefaultParameters};
-    use crate::frontend::vars::Bytes32Variable;
+    use crate::backend::circuit::CircuitBuild;
     use crate::prelude::*;
     use crate::utils::hash::sha256;
     use crate::utils::{bytes, bytes32};

diff --git a/plonky2x/core/src/frontend/hash/sha/sha256/mod.rs b/plonky2x/core/src/frontend/hash/sha/sha256/mod.rs
@@ -159,7 +159,7 @@ mod tests {
     use rand::{thread_rng, Rng};
 
     use super::*;
-    use crate::prelude::{ByteVariable, CircuitBuilder, DefaultParameters, U32Variable};
+    use crate::prelude::{DefaultParameters, U32Variable};
     use crate::utils::hash::sha256;
 
     type L = DefaultParameters;

diff --git a/plonky2x/core/src/frontend/hint/simple/hint.rs b/plonky2x/core/src/frontend/hint/simple/hint.rs
@@ -73,7 +73,6 @@ mod tests {
     use serde::{Deserialize, Serialize};
 
     use super::*;
-    use crate::frontend::vars::ValueStream;
     use crate::prelude::*;
 
     #[derive(Debug, Clone, Serialize, Deserialize)]

diff --git a/plonky2x/core/src/frontend/hint/simple/serializer.rs b/plonky2x/core/src/frontend/hint/simple/serializer.rs
@@ -62,7 +62,6 @@ mod tests {
 
     use super::*;
     use crate::backend::circuit::CircuitBuild;
-    use crate::frontend::vars::ValueStream;
     use crate::prelude::*;
 
     #[derive(Debug, Clone, Serialize, Deserialize)]

diff --git a/plonky2x/core/src/frontend/hint/synchronous.rs b/plonky2x/core/src/frontend/hint/synchronous.rs
@@ -57,7 +57,6 @@ mod tests {
     use serde::{Deserialize, Serialize};
 
     use super::*;
-    use crate::frontend::vars::{ValueStream, VariableStream};
     use crate::prelude::*;
 
     #[derive(Debug, Clone, Serialize, Deserialize)]

diff --git a/plonky2x/core/src/frontend/merkle/simple.rs b/plonky2x/core/src/frontend/merkle/simple.rs
@@ -133,7 +133,6 @@ mod tests {
 
     use std::env;
 
-    use crate::backend::circuit::DefaultParameters;
     use crate::frontend::merkle::simple::SimpleMerkleTree;
     use crate::prelude::*;
 

diff --git a/plonky2x/core/src/frontend/merkle/tendermint.rs b/plonky2x/core/src/frontend/merkle/tendermint.rs
@@ -222,7 +222,6 @@ mod tests {
     use ethers::types::H256;
     use itertools::Itertools;
 
-    use crate::backend::circuit::DefaultParameters;
     use crate::frontend::merkle::tendermint::TendermintMerkleTree;
     use crate::frontend::merkle::tree::{InclusionProof, MerkleInclusionProofVariable};
     use crate::prelude::*;

diff --git a/plonky2x/core/src/frontend/merkle/tree.rs b/plonky2x/core/src/frontend/merkle/tree.rs
@@ -1,5 +1,3 @@
-use plonky2::hash::hash_types::RichField;
-
 use crate::prelude::*;
 
 #[derive(Clone, Debug, CircuitVariable)]

diff --git a/plonky2x/core/src/frontend/recursion/extension.rs b/plonky2x/core/src/frontend/recursion/extension.rs
@@ -1,7 +1,6 @@
 use plonky2::field::extension::FieldExtension;
 use plonky2::iop::ext_target::ExtensionTarget;
 
-use crate::frontend::vars::ValueStream;
 use crate::prelude::*;
 
 #[derive(Debug, Clone, Eq, PartialEq, CircuitVariable)]

diff --git a/plonky2x/core/src/frontend/recursion/fri/proof.rs b/plonky2x/core/src/frontend/recursion/fri/proof.rs
@@ -554,7 +554,6 @@ impl<const D: usize> From<FriProofVariable<D>> for FriProofTarget<D> {
 
 #[cfg(test)]
 mod tests {
-    use plonky2::fri::proof::FriProofTarget;
     use plonky2::hash::poseidon::PoseidonHash;
     use plonky2::plonk::plonk_common::salt_size;
 

diff --git a/plonky2x/core/src/frontend/recursion/hash.rs b/plonky2x/core/src/frontend/recursion/hash.rs
@@ -4,7 +4,6 @@ use plonky2::hash::merkle_tree::MerkleCap;
 use plonky2::plonk::config::AlgebraicHasher;
 
 use crate::frontend::hash::poseidon::poseidon256::PoseidonHashOutVariable;
-use crate::frontend::vars::{OutputVariableStream, VariableStream};
 use crate::prelude::*;
 
 #[derive(Clone, Debug, Eq, PartialEq)]

diff --git a/plonky2x/core/src/frontend/uint/num/biguint/mod.rs b/plonky2x/core/src/frontend/uint/num/biguint/mod.rs
@@ -575,9 +575,8 @@ impl ReadBigUint for Buffer<'_> {
 
 #[cfg(test)]
 mod tests {
-    use num::{BigUint, FromPrimitive, Integer};
+    use num::FromPrimitive;
     use plonky2::iop::witness::PartialWitness;
-    use plonky2::plonk::circuit_builder::CircuitBuilder;
     use plonky2::plonk::circuit_data::CircuitConfig;
     use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
     use rand::rngs::OsRng;

diff --git a/plonky2x/core/src/frontend/uint/num/u32/gadgets/arithmetic_u32.rs b/plonky2x/core/src/frontend/uint/num/u32/gadgets/arithmetic_u32.rs
@@ -1,6 +1,4 @@
-use alloc::string::{String, ToString};
 use alloc::vec;
-use alloc::vec::Vec;
 use core::marker::PhantomData;
 
 use plonky2::field::extension::Extendable;

diff --git a/plonky2x/core/src/frontend/uint/num/u32/gadgets/multiple_comparison.rs b/plonky2x/core/src/frontend/uint/num/u32/gadgets/multiple_comparison.rs
@@ -1,5 +1,4 @@
 use alloc::vec;
-use alloc::vec::Vec;
 
 use plonky2::field::extension::Extendable;
 use plonky2::hash::hash_types::RichField;

diff --git a/plonky2x/core/src/frontend/uint/num/u32/gadgets/range_check.rs b/plonky2x/core/src/frontend/uint/num/u32/gadgets/range_check.rs
@@ -1,5 +1,4 @@
 use alloc::vec;
-use alloc::vec::Vec;
 
 use plonky2::field::extension::Extendable;
 use plonky2::hash::hash_types::RichField;

diff --git a/plonky2x/core/src/frontend/uint/num/u32/gates/add_many_u32.rs b/plonky2x/core/src/frontend/uint/num/u32/gates/add_many_u32.rs
@@ -1,6 +1,4 @@
 use alloc::format;
-use alloc::string::{String, ToString};
-use alloc::vec::Vec;
 use core::marker::PhantomData;
 
 use itertools::unfold;

diff --git a/plonky2x/core/src/frontend/uint/num/u32/gates/arithmetic_u32.rs b/plonky2x/core/src/frontend/uint/num/u32/gates/arithmetic_u32.rs
@@ -1,5 +1,3 @@
-use alloc::string::{String, ToString};
-use alloc::vec::Vec;
 use alloc::{format, vec};
 use core::marker::PhantomData;
 

diff --git a/plonky2x/core/src/frontend/uint/num/u32/gates/comparison.rs b/plonky2x/core/src/frontend/uint/num/u32/gates/comparison.rs
@@ -1,5 +1,3 @@
-use alloc::string::{String, ToString};
-use alloc::vec::Vec;
 use alloc::{format, vec};
 use core::marker::PhantomData;
 

diff --git a/plonky2x/core/src/frontend/uint/num/u32/gates/range_check_u32.rs b/plonky2x/core/src/frontend/uint/num/u32/gates/range_check_u32.rs
@@ -1,5 +1,3 @@
-use alloc::string::{String, ToString};
-use alloc::vec::Vec;
 use alloc::{format, vec};
 use core::marker::PhantomData;
 
@@ -242,7 +240,7 @@ mod tests {
     use itertools::unfold;
     use plonky2::field::extension::quartic::QuarticExtension;
     use plonky2::field::goldilocks_field::GoldilocksField;
-    use plonky2::field::types::{Field, Sample};
+    use plonky2::field::types::Sample;
     use plonky2::gates::gate_testing::{test_eval_fns, test_low_degree};
     use plonky2::hash::hash_types::HashOut;
     use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};

diff --git a/plonky2x/core/src/frontend/uint/num/u32/gates/subtraction_u32.rs b/plonky2x/core/src/frontend/uint/num/u32/gates/subtraction_u32.rs
@@ -1,5 +1,3 @@
-use alloc::string::{String, ToString};
-use alloc::vec::Vec;
 use alloc::{format, vec};
 use core::marker::PhantomData;
 

diff --git a/plonky2x/core/src/frontend/uint/num/u32/serialization.rs b/plonky2x/core/src/frontend/uint/num/u32/serialization.rs
@@ -1,5 +1,3 @@
-use alloc::vec::Vec;
-
 use plonky2::util::serialization::{Buffer, IoResult, Read, Write};
 
 use crate::frontend::uint::num::u32::gadgets::arithmetic_u32::U32Target;

diff --git a/plonky2x/core/src/frontend/uint/uint32.rs b/plonky2x/core/src/frontend/uint/uint32.rs
@@ -1,16 +1,12 @@
 use std::fmt::Debug;
 
 use itertools::Itertools;
-use plonky2::hash::hash_types::RichField;
 use plonky2::iop::target::BoolTarget;
 
-use super::uint64::U64Variable;
-use crate::backend::circuit::PlonkParameters;
-use crate::frontend::builder::CircuitBuilder;
 use crate::frontend::uint::num::biguint::{BigUintTarget, CircuitBuilderBiguint};
 use crate::frontend::uint::num::u32::gadgets::arithmetic_u32::{CircuitBuilderU32, U32Target};
 use crate::frontend::uint::num::u32::gadgets::multiple_comparison::list_lte_circuit;
-use crate::frontend::vars::{CircuitVariable, EvmVariable, Variable};
+use crate::frontend::vars::EvmVariable;
 use crate::prelude::*;
 
 /// A variable in the circuit representing a u32 value.
@@ -277,8 +273,6 @@ impl U32Variable {
 mod tests {
     use rand::Rng;
 
-    use super::U32Variable;
-    use crate::backend::circuit::DefaultParameters;
     use crate::frontend::vars::EvmVariable;
     use crate::prelude::*;
     use crate::utils::setup_logger;

diff --git a/plonky2x/core/src/frontend/vars/array.rs b/plonky2x/core/src/frontend/vars/array.rs
@@ -368,13 +368,10 @@ mod tests {
 
     use ethers::types::U256;
     use log::debug;
-    use plonky2::field::types::Field;
     use rand::rngs::OsRng;
     use rand::Rng;
 
     use super::*;
-    use crate::backend::circuit::DefaultParameters;
-    use crate::frontend::vars::U256Variable;
     use crate::prelude::*;
     use crate::utils;
 

diff --git a/plonky2x/core/src/frontend/vars/boolean.rs b/plonky2x/core/src/frontend/vars/boolean.rs
@@ -130,7 +130,6 @@ impl<L: PlonkParameters<D>, const D: usize> Not<L, D> for BoolVariable {
 
 #[cfg(test)]
 mod tests {
-    use crate::backend::circuit::DefaultParameters;
     use crate::prelude::*;
 
     type L = DefaultParameters;

diff --git a/plonky2x/core/src/frontend/vars/byte.rs b/plonky2x/core/src/frontend/vars/byte.rs
@@ -293,7 +293,6 @@ impl<L: PlonkParameters<D>, const D: usize> Zero<L, D> for ByteVariable {
 mod tests {
     use itertools::Itertools;
 
-    use crate::backend::circuit::DefaultParameters;
     use crate::prelude::*;
 
     type L = DefaultParameters;

diff --git a/plonky2x/core/src/frontend/vars/bytes.rs b/plonky2x/core/src/frontend/vars/bytes.rs
@@ -291,7 +291,6 @@ impl<L: PlonkParameters<D>, const D: usize, const N: usize> RotateRight<L, D, us
 mod tests {
     use rand::{thread_rng, Rng};
 
-    use crate::backend::circuit::DefaultParameters;
     use crate::prelude::*;
 
     type L = DefaultParameters;

diff --git a/plonky2x/core/src/frontend/vars/mod.rs b/plonky2x/core/src/frontend/vars/mod.rs
@@ -188,7 +188,6 @@ pub trait SSZVariable: CircuitVariable {
 
 #[cfg(test)]
 mod tests {
-    use crate::frontend::vars::ArrayVariable;
     use crate::prelude::*;
 
     #[test]

diff --git a/plonky2x/core/src/utils/eth/beacon/mod.rs b/plonky2x/core/src/utils/eth/beacon/mod.rs
@@ -776,7 +776,6 @@ mod tests {
 
     use std::env;
 
-    use anyhow::Result;
     use log::debug;
 
     use super::*;

diff --git a/plonky2x/core/src/utils/lido/mod.rs b/plonky2x/core/src/utils/lido/mod.rs
@@ -1,10 +1,7 @@
 use alloc::sync::Arc;
-use std::convert::TryFrom;
 
 use anyhow::Result;
 use ethers::prelude::*;
-use ethers::providers::{Http, Middleware, Provider};
-use ethers::types::{Address, H256, U256};
 use ethers::utils::keccak256;
 use log::info;