From 7a882d0a64c211f9ce77820877db3b23aa2f89ef Mon Sep 17 00:00:00 2001 From: Hamy Ratoanina Date: Fri, 23 Jun 2023 11:06:51 -0400 Subject: [PATCH] Clippy --- evm/src/fixed_recursive_verifier.rs | 14 +++++--------- evm/src/recursive_verifier.rs | 2 +- evm/src/util.rs | 1 + evm/tests/empty_txn_list.rs | 10 ++++------ 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/evm/src/fixed_recursive_verifier.rs b/evm/src/fixed_recursive_verifier.rs index 65e6ac01..06333b27 100644 --- a/evm/src/fixed_recursive_verifier.rs +++ b/evm/src/fixed_recursive_verifier.rs @@ -32,7 +32,7 @@ use crate::config::StarkConfig; use crate::cpu::cpu_stark::CpuStark; use crate::cpu::kernel::constants::global_metadata::GlobalMetadata; use crate::cross_table_lookup::{verify_cross_table_lookups_circuit, CrossTableLookup}; -use crate::generation::{self, GenerationInputs}; +use crate::generation::GenerationInputs; use crate::keccak::keccak_stark::KeccakStark; use crate::keccak_sponge::keccak_sponge_stark::KeccakSpongeStark; use crate::logic::LogicStark; @@ -42,18 +42,14 @@ use crate::memory::{NUM_CHANNELS, VALUE_LIMBS}; use crate::permutation::{ get_grand_product_challenge_set_target, GrandProductChallenge, GrandProductChallengeSet, }; -use crate::proof::{ - BlockMetadata, BlockMetadataTarget, PublicValues, PublicValuesTarget, StarkProofWithMetadata, - TrieRootsTarget, -}; +use crate::proof::{PublicValues, PublicValuesTarget, StarkProofWithMetadata}; use crate::prover::prove; use crate::recursive_verifier::{ - add_common_recursion_gates, add_virtual_public_values, add_virtual_trie_roots, - recursive_stark_circuit, set_block_metadata_target, set_trie_roots_target, PlonkWrapperCircuit, - PublicInputs, StarkWrapperCircuit, + add_common_recursion_gates, add_virtual_public_values, recursive_stark_circuit, + set_block_metadata_target, set_trie_roots_target, PlonkWrapperCircuit, PublicInputs, + StarkWrapperCircuit, }; use crate::stark::Stark; -use crate::util::h160_limbs; /// The recursion threshold. We end a chain of recursive proofs once we reach this size. const THRESHOLD_DEGREE_BITS: usize = 13; diff --git a/evm/src/recursive_verifier.rs b/evm/src/recursive_verifier.rs index b8b87e71..b9b36dcd 100644 --- a/evm/src/recursive_verifier.rs +++ b/evm/src/recursive_verifier.rs @@ -39,7 +39,7 @@ use crate::proof::{ TrieRootsTarget, }; use crate::stark::Stark; -use crate::util::{h160_limbs, h256_limbs}; +use crate::util::h160_limbs; use crate::vanishing_poly::eval_vanishing_poly_circuit; use crate::vars::StarkEvaluationTargets; diff --git a/evm/src/util.rs b/evm/src/util.rs index 3ad88778..d39ea83d 100644 --- a/evm/src/util.rs +++ b/evm/src/util.rs @@ -61,6 +61,7 @@ pub(crate) fn u256_limbs(u256: U256) -> [F; 8] { .unwrap() } +#[allow(unused)] /// Returns the 32-bit little-endian limbs of a `H256`. pub(crate) fn h256_limbs(h256: H256) -> [F; 8] { h256.0 diff --git a/evm/tests/empty_txn_list.rs b/evm/tests/empty_txn_list.rs index fae020c4..50f677cb 100644 --- a/evm/tests/empty_txn_list.rs +++ b/evm/tests/empty_txn_list.rs @@ -5,7 +5,7 @@ use std::marker::PhantomData; use std::time::Duration; use env_logger::{try_init_from_env, Env, DEFAULT_FILTER_ENV}; -use eth_trie_utils::partial_trie::{HashedPartialTrie, PartialTrie}; +use eth_trie_utils::partial_trie::HashedPartialTrie; use keccak_hash::keccak; use log::info; use plonky2::field::goldilocks_field::GoldilocksField; @@ -15,10 +15,8 @@ use plonky2::util::timing::TimingTree; use plonky2_evm::all_stark::AllStark; use plonky2_evm::config::StarkConfig; use plonky2_evm::fixed_recursive_verifier::AllRecursiveCircuits; -use plonky2_evm::generation::{generate_traces, GenerationInputs, TrieInputs}; -use plonky2_evm::proof::{BlockMetadata, TrieRoots}; -use plonky2_evm::prover::prove; -use plonky2_evm::verifier::verify_proof; +use plonky2_evm::generation::{GenerationInputs, TrieInputs}; +use plonky2_evm::proof::BlockMetadata; use plonky2_evm::Node; type F = GoldilocksField; @@ -27,7 +25,7 @@ type C = PoseidonGoldilocksConfig; /// Execute the empty list of transactions, i.e. a no-op. #[test] -//#[ignore] // Too slow to run on CI. +#[ignore] // Too slow to run on CI. fn test_empty_txn_list() -> anyhow::Result<()> { init_logger();