Skip to content
This repository has been archived by the owner on May 3, 2024. It is now read-only.

Commit

Permalink
cargo fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@CeciliaZ030
CeciliaZ030 committed Sep 3, 2023
1 parent 09cb220 commit 54c1764
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion zkevm-circuits/src/circuit_tools/constraint_builder.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::{evm_circuit::util::rlc, table::LookupTable, util::{Expr, query_expre
use eth_types::Field;
use gadgets::util::{and, sum, Scalar};
use halo2_proofs::{
plonk::{ConstraintSystem, Expression, Column, Advice, Selector}, circuit::AssignedCell,
plonk::{ConstraintSystem, Expression, Column, Advice, Selector},
};
use itertools::Itertools;

Expand Down
18 changes: 9 additions & 9 deletions zkevm-circuits/src/taiko_pi_circuit.rs
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@


use bus_mapping::evm;
use eth_types::{Address, Field, ToBigEndian, ToWord, Word, H256, H160, U256};

use eth_types::{Field, ToBigEndian, ToWord, H256, H160, U256};

Check warning on line 4 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Intra-doc links 

unused import: `H256`

Check warning on line 4 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Rustfmt 

unused import: `H256`

Check failure on line 4 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Clippy

unused import: `H256` 

error: unused import: `H256`
 --> zkevm-circuits/src/taiko_pi_circuit.rs:4:45
  |
4 | use eth_types::{Field, ToBigEndian, ToWord, H256, H160, U256};
  |                                             ^^^^
  |
  = note: `-D unused-imports` implied by `-D warnings`

Check warning on line 4 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Build target wasm32-unknown-unknown 

unused import: `H256`

Check warning on line 4 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Build target wasm32-unknown-unknown 

unused import: `H256`

Check warning on line 4 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Bitrot check 

unused import: `H256`

Check warning on line 4 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Build target wasm32-wasi 

unused import: `H256`

Check warning on line 4 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Build target wasm32-wasi 

unused import: `H256`
use ethers_core::abi::*;
use ethers_core::abi::FixedBytes;

use ethers_core::utils::keccak256;
use halo2_proofs::circuit::{Value, Layouter, SimpleFloorPlanner, AssignedCell};
use halo2_proofs::poly::Rotation;

use itertools::Itertools;

Check warning on line 10 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Intra-doc links 

unused import: `itertools::Itertools`

Check warning on line 10 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Rustfmt 

unused import: `itertools::Itertools`

Check failure on line 10 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Clippy

unused import: `itertools::Itertools` 

error: unused import: `itertools::Itertools`
  --> zkevm-circuits/src/taiko_pi_circuit.rs:10:5
   |
10 | use itertools::Itertools;
   |     ^^^^^^^^^^^^^^^^^^^^

Check warning on line 10 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Build target wasm32-unknown-unknown 

unused import: `itertools::Itertools`

Check warning on line 10 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Build target wasm32-unknown-unknown 

unused import: `itertools::Itertools`

Check warning on line 10 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Bitrot check 

unused import: `itertools::Itertools`

Check warning on line 10 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Build target wasm32-wasi 

unused import: `itertools::Itertools`

Check warning on line 10 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Build target wasm32-wasi 

unused import: `itertools::Itertools`
use std::convert::TryInto;
use std::marker::PhantomData;
use gadgets::util::{Expr, Scalar};
use halo2_proofs::plonk::{Expression, ConstraintSystem, Selector, Instance, Column, Circuit};
use keccak256::keccak_arith::Keccak;

use halo2_proofs::plonk::Error;
use core::result::Result;
use crate::circuit_tools::cached_region::CachedRegion;
Expand All @@ -21,7 +21,7 @@ use crate::circuit_tools::constraint_builder::{ConstraintBuilder, TO_FIX, RLCabl
use crate::evm_circuit::table::Table;
use crate::evm_circuit::util::rlc;
use crate::util::{Challenges, SubCircuitConfig, SubCircuit};
use crate::witness::{self, Bytecode, BlockContext};
use crate::witness::{self, BlockContext};
use crate::{circuit, assign};
use crate::table::{byte_table::ByteTable, BlockContextFieldTag, BlockTable, KeccakTable, LookupTable};

Check warning on line 26 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Intra-doc links 

unused import: `LookupTable`

Check warning on line 26 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Rustfmt 

unused import: `LookupTable`

Check failure on line 26 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Clippy

unused import: `LookupTable` 

error: unused import: `LookupTable`
  --> zkevm-circuits/src/taiko_pi_circuit.rs:26:90
   |
26 | use crate::table::{byte_table::ByteTable, BlockContextFieldTag, BlockTable, KeccakTable, LookupTable};
   |                                                                                          ^^^^^^^^^^^

Check warning on line 26 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Build target wasm32-unknown-unknown 

unused import: `LookupTable`

Check warning on line 26 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Build target wasm32-unknown-unknown 

unused import: `LookupTable`

Check warning on line 26 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Bitrot check 

unused import: `LookupTable`

Check warning on line 26 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Build target wasm32-wasi 

unused import: `LookupTable`

Check warning on line 26 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Build target wasm32-wasi 

unused import: `LookupTable`

Expand Down Expand Up @@ -417,7 +417,7 @@ impl<F: Field> TaikoPiCircuitConfig<F> {
) -> Result<(), Error> {
let evm_word = challenge.evm_word();
let keccak_r = challenge.keccak_input();
let mut hi_lo_cells = layouter.assign_region(
let hi_lo_cells = layouter.assign_region(
|| "Pi",
|mut region| {
self.q_enable.enable(&mut region, 0)?;
Expand All @@ -429,7 +429,7 @@ impl<F: Field> TaikoPiCircuitConfig<F> {
assign!(region, self.block_hash.0, 0 => (evidence.block_context.number).as_u64().scalar());
assign!(region, self.block_hash.2, 0 => evidence.assignment_acc(BLOCK_HASH, evm_word));

let mut acc = F::ZERO;
let _acc = F::ZERO;
let mut idx = 0;
[
&self.meta_hash,
Expand Down Expand Up @@ -581,7 +581,7 @@ mod taiko_pi_circuit_test {

use super::*;

use eth_types::ToScalar;

use halo2_proofs::{
dev::{MockProver, VerifyFailure},
halo2curves::bn256::Fr,
Expand Down
4 changes: 2 additions & 2 deletions zkevm-circuits/src/witness/block.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ use bus_mapping::{
circuit_input_builder::{self, CircuitsParams, CopyEvent, ExpEvent},
Error,
};
use eth_types::{Address, Field, ToLittleEndian, ToScalar, ToWord, Word, ToBigEndian};
use gadgets::util::Scalar;
use eth_types::{Address, Field, ToLittleEndian, ToScalar, ToWord, Word};

use halo2_proofs::circuit::Value;

use super::{tx::tx_convert, Bytecode, ExecStep, ProtocolInstance, Rw, RwMap, Transaction};
Expand Down

0 comments on commit 54c1764

Please sign in to comment.