move evm_circuit::witness as crate::witness; split it into smaller mo…

…ds (privacy-scaling-explorations#726) * move evm_circuit::witness as crate::witness; split it into smaller mods * fix merge * add basic docs * fmt
lfzkoala · Sep 7, 2022 · 3e400dc · 3e400dc
1 parent 6aafd7c
commit 3e400dc
Show file tree

Hide file tree

Showing 18 changed files with 1,523 additions and 1,463 deletions.
diff --git a/zkevm-circuits/src/evm_circuit.rs b/zkevm-circuits/src/evm_circuit.rs
@@ -8,13 +8,13 @@ use halo2_proofs::{
 
 mod execution;
 pub mod param;
-mod step;
+pub(crate) mod step;
 pub(crate) mod util;
 
 pub mod table;
-pub mod witness;
 
 use crate::table::LookupTable;
+pub use crate::witness;
 use eth_types::Field;
 use execution::ExecutionConfig;
 use itertools::Itertools;

diff --git a/zkevm-circuits/src/evm_circuit/table.rs b/zkevm-circuits/src/evm_circuit/table.rs
@@ -1,6 +1,5 @@
 use crate::evm_circuit::step::ExecutionState;
 use crate::impl_expr;
-pub use crate::table::TxContextFieldTag;
 use eth_types::Field;
 use gadgets::util::Expr;
 use halo2_proofs::plonk::Expression;

diff --git a/zkevm-circuits/src/evm_circuit/util/common_gadget.rs b/zkevm-circuits/src/evm_circuit/util/common_gadget.rs
@@ -11,10 +11,10 @@ use crate::{
             math_gadget::{AddWordsGadget, RangeCheckGadget},
             Cell, Word,
         },
-        witness::{Block, Call, ExecStep},
     },
     table::{AccountFieldTag, CallContextFieldTag},
     util::Expr,
+    witness::{Block, Call, ExecStep},
 };
 use eth_types::{Field, ToLittleEndian, ToScalar, U256};
 use halo2_proofs::{