fix merge

Author: adria0

integration-tests/tests/circuits.rs

@@ -85,7 +85,7 @@ async fn test_tx_circuit_block(block_num: u64) {
     let txs: Vec<_> = eth_block
         .transactions
         .iter()
-        .map(|tx| geth_types::Transaction::from_eth_tx(tx))
+        .map(geth_types::Transaction::from_eth_tx)
         .collect();
 
     let mut rng = ChaCha20Rng::seed_from_u64(2);

zkevm-circuits/src/bytecode_circuit/dev.rs

@@ -45,7 +45,7 @@ impl<F: Field> Circuit<F> for BytecodeCircuitTester<F> {
         config.load(&mut layouter)?;
         config.keccak_table.load(
             &mut layouter,
-            self.bytecodes.iter().map(|b| b.bytes.as_slice()),
+            self.bytecodes.iter().map(|b| b.bytes.clone()),
             self.randomness,
         )?;
         config.assign(&mut layouter, self.size, &self.bytecodes, self.randomness)?;

zkevm-circuits/src/copy_circuit.rs

@@ -693,11 +693,13 @@ pub mod dev {
         block: Block<F>,
     }
 
-    impl<F> CopyCircuitTester<F> {
-
+    impl<F: Field> CopyCircuitTester<F> {
         pub fn new(block: Block<F>) -> Self {
             Self { block }
         }
+        pub fn r() -> Expression<F> {
+            123456u64.expr()
+        }
     }
 
     impl<F: Field> Circuit<F> for CopyCircuitTester<F> {