Implement bytecode refactor spec in circuit

circuit-benchmarks/src/bytecode_circuit.rs

@@ -19,9 +19,9 @@ mod tests {
     use rand::SeedableRng;
     use rand_xorshift::XorShiftRng;
     use std::env::var;
-    use zkevm_circuits::bytecode_circuit::bytecode_unroller::{
-        unroll, BytecodeCircuit, UnrolledBytecode,
-    };
+    use zkevm_circuits::bytecode_circuit::bytecode_unroller::{unroll, UnrolledBytecode};
+
+    use zkevm_circuits::bytecode_circuit::circuit::BytecodeCircuit;
 
     #[cfg_attr(not(feature = "benches"), ignore)]
     #[test]

integration-tests/src/integration_test_circuits.rs

@@ -23,7 +23,7 @@ use rand_core::RngCore;
 use rand_xorshift::XorShiftRng;
 use std::collections::HashMap;
 use std::sync::Mutex;
-use zkevm_circuits::bytecode_circuit::bytecode_unroller::BytecodeCircuit;
+use zkevm_circuits::bytecode_circuit::circuit::BytecodeCircuit;
 use zkevm_circuits::copy_circuit::CopyCircuit;
 use zkevm_circuits::evm_circuit::witness::block_convert;
 use zkevm_circuits::state_circuit::StateCircuit;

integration-tests/tests/circuits.rs

@@ -66,7 +66,7 @@ macro_rules! unroll_tests {
             super_circuit::SuperCircuit,
             tx_circuit::TxCircuit,
             evm_circuit::EvmCircuit,
-            bytecode_circuit::bytecode_unroller::BytecodeCircuit,
+            bytecode_circuit::circuit::BytecodeCircuit,
             copy_circuit::CopyCircuit
         };
         use halo2_proofs::halo2curves::bn256::Fr;

zkevm-circuits/src/bytecode_circuit.rs

@@ -2,6 +2,8 @@
 
 /// Bytecode unroller
 pub mod bytecode_unroller;
+/// Bytecode circuit
+pub mod circuit;
 /// Bytecode circuit tester
 #[cfg(any(feature = "test", test))]
 pub mod dev;