fix merge

Author: lightsing

zkevm-circuits/src/copy_circuit.rs

@@ -39,7 +39,7 @@ use crate::{
     evm_circuit::util::{constraint_builder::BaseConstraintBuilder, math_gadget::LtGadget},
     table::{
         BytecodeFieldTag, BytecodeTable, CopyTable, LookupTable, RwTable, RwTableTag,
-        TxContextFieldTag, TxTable, U8Table,
+        TxContextFieldTag, TxTable, U8Table, UXTable,
     },
     util::{Challenges, SubCircuit, SubCircuitConfig},
     witness,
@@ -120,7 +120,7 @@ pub struct CopyCircuitConfig<F> {
     /// BytecodeTable
     pub bytecode_table: BytecodeTable,
     /// u8 lookup Table
-    pub u8_table: U8Table,
+    pub u8_table: UXTable<8>,
 }
 
 /// Circuit configuration arguments
@@ -138,7 +138,7 @@ pub struct CopyCircuitConfigArgs<F: Field> {
     /// Challenges
     pub challenges: Challenges<Expression<F>>,
     /// u8 lookup Table
-    pub u8_table: U8Table,
+    pub u8_table: UXTable<8>,
 }
 
 impl<F: Field> SubCircuitConfig<F> for CopyCircuitConfig<F> {
@@ -186,7 +186,7 @@ impl<F: Field> SubCircuitConfig<F> for CopyCircuitConfig<F> {
                     |meta| meta.query_selector(q_step),
                     |meta| meta.query_advice(lhs_base, CURRENT) + idx.expr(),
                     |meta| meta.query_advice(rhs, CURRENT),
-                    u8_table.into(),
+                    u8_table.col,
                 )
             })
         };

zkevm-circuits/src/copy_circuit/dev.rs

@@ -2,7 +2,7 @@ pub use super::CopyCircuit;
 
 use crate::{
     copy_circuit::{CopyCircuitConfig, CopyCircuitConfigArgs},
-    table::{BytecodeTable, CopyTable, RwTable, TxTable, U8Table},
+    table::{BytecodeTable, CopyTable, RwTable, TxTable, U8Table, UXTable},
     util::{Challenges, SubCircuit, SubCircuitConfig},
 };
 use eth_types::Field;
@@ -29,7 +29,7 @@ impl<F: Field> Circuit<F> for CopyCircuit<F> {
         let copy_table = CopyTable::construct(meta, q_enable);
         let challenges = Challenges::construct(meta);
         let challenge_exprs = challenges.exprs(meta);
-        let u8_table = U8Table::construct(meta);
+        let u8_table = UXTable::construct(meta);
 
         (
             CopyCircuitConfig::new(

zkevm-circuits/src/super_circuit.rs

@@ -310,7 +310,7 @@ impl SubCircuitConfig<Fr> for SuperCircuitConfig<Fr> {
                 copy_table,
                 q_enable: q_copy_table,
                 challenges: challenges_expr.clone(),
-                u8_table,
+                u8_table: ux8_table,
             },
         );
         log_circuit_info(meta, "copy circuit");