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 Aug 23, 2023
1 parent b3df73e commit e723a84
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 16 deletions.
2 changes: 1 addition & 1 deletion zkevm-circuits/src/circuit_tools/cell_manager.rs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! Cell manager
use crate::{
circuit_tools::cached_region::CachedRegion,
util::{query_expression, Expr}, evm_circuit::util::rlc,
util::{query_expression, Expr},
};

use crate::table::LookupTable;
Expand Down
2 changes: 1 addition & 1 deletion zkevm-circuits/src/table/keccak_table.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use eth_types::ToBigEndian;


use super::*;

Expand Down
27 changes: 13 additions & 14 deletions zkevm-circuits/src/taiko_pi_circuit.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,30 @@
use crate::{
assign,
evm_circuit::table::Table::*,
evm_circuit::{util::{constraint_builder::{BaseConstraintBuilder, ConstrainBuilderCommon}, rlc}, table::Table},
evm_circuit::{util::{constraint_builder::{ConstrainBuilderCommon}}, table::Table},

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

View workflow job for this annotation

GitHub Actions / Clippy

unused import: `ConstrainBuilderCommon` 

error: unused import: `ConstrainBuilderCommon`
 --> zkevm-circuits/src/taiko_pi_circuit.rs:6:47
  |
6 |     evm_circuit::{util::{constraint_builder::{ConstrainBuilderCommon}}, table::Table},
  |                                               ^^^^^^^^^^^^^^^^^^^^^^

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

View workflow job for this annotation

GitHub Actions / Build target wasm32-unknown-unknown 

unused import: `ConstrainBuilderCommon`

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

View workflow job for this annotation

GitHub Actions / Build target wasm32-wasi 

unused import: `ConstrainBuilderCommon`
table::{byte_table::ByteTable, BlockContextFieldTag, BlockTable, KeccakTable, LookupTable},

Check failure on line 7 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:7:83
  |
7 |     table::{byte_table::ByteTable, BlockContextFieldTag, BlockTable, KeccakTable, LookupTable},
  |                                                                                   ^^^^^^^^^^^

Check warning on line 7 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 7 in zkevm-circuits/src/taiko_pi_circuit.rs

View workflow job for this annotation

GitHub Actions / Build target wasm32-wasi 

unused import: `LookupTable`
util::{Challenges, SubCircuitConfig, SubCircuit},
circuit_tools::{
constraint_builder::{ConstraintBuilder, RLCable, RLCChainable, TO_FIX, COMPRESS, REDUCE, RLCableValue},
cell_manager::{CellManager, CellType, Cell, CellConfig, CellColumn}, gadgets::{IsEqualGadget, IsZeroGadget}, cached_region::{CachedRegion, self},
constraint_builder::{ConstraintBuilder, RLCable, TO_FIX, RLCableValue},
cell_manager::{CellManager, CellType, Cell, CellColumn}, gadgets::{IsEqualGadget}, cached_region::{CachedRegion},
},

witness::{self, BlockContext}, circuit, assignf,
witness::{self, BlockContext}, circuit,
};
use bus_mapping::{evm, operation::Op};

use gadgets::util::{Scalar, not};
use eth_types::{Address, Field, ToBigEndian, ToWord, Word, H256};
use ethers_core::utils::keccak256;
use gadgets::{util::{or, select, Expr, and}, impl_expr};
use gadgets::{util::{Expr}};
use halo2_proofs::{
circuit::{AssignedCell, Layouter, Region, SimpleFloorPlanner, Value},
circuit::{Layouter, SimpleFloorPlanner, Value},
plonk::{
Advice, Circuit, Column, ConstraintSystem, Error, Expression, Fixed, Instance, SecondPhase,
Selector, VirtualCells,
Circuit, Column, ConstraintSystem, Error, Expression, Instance,
Selector,
},
poly::{Rotation},
};
use rand_chacha::rand_core::block;
use std::{marker::PhantomData, ops::Range, usize, default, vec};

use std::{marker::PhantomData, usize, vec};

const BYTE_POW_BASE: u64 = 1 << 8;
const N: usize = 32;
Expand Down Expand Up @@ -348,7 +347,7 @@ impl<F: Field> SubCircuitConfig<F> for TaikoPiCircuitConfig<F> {
// meta.pinned().print_config_states();
// meta.pinned().print_layout_states();

let mut col_configs = cm.columns().to_vec();
let col_configs = cm.columns().to_vec();
Self {
q_enable,
public_input,
Expand Down Expand Up @@ -394,7 +393,7 @@ impl<F: Field> TaikoPiCircuitConfig<F> {
let mut offset = 0;
let mut state = 0;
let mut pi_cells = Vec::new();
for (annotation, block_number, bytes) in assignments {
for (_annotation, block_number, bytes) in assignments {

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

View workflow job for this annotation

GitHub Actions / Clippy

the variable `state` is used as a loop counter 

error: the variable `state` is used as a loop counter
   --> zkevm-circuits/src/taiko_pi_circuit.rs:396:17
    |
396 |                 for (_annotation, block_number, bytes) in assignments {
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `for (state, (_annotation, block_number, bytes)) in assignments.into_iter().enumerate()`
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#explicit_counter_loop
    = note: `-D clippy::explicit-counter-loop` implied by `-D warnings`
self.state.assign(&mut region, offset, state)?;
if state != KECCAK_OUTPUT {
let next = block_acc * keccak_mult
Expand Down

0 comments on commit e723a84

Please sign in to comment.