From 52934e4fcce9784e50c66a34f4905fbf4e3cff2e Mon Sep 17 00:00:00 2001
From: David Nevado <david@davidnevado.xyz>
Date: Fri, 16 Jun 2023 18:27:51 +0200
Subject: [PATCH] Fix merging details

---
 bus-mapping/src/evm/opcodes/create.rs              | 4 ++--
 zkevm-circuits/src/evm_circuit/execution/end_tx.rs | 2 +-
 zkevm-circuits/src/root_circuit/test.rs            | 2 +-
 zkevm-circuits/src/super_circuit.rs                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bus-mapping/src/evm/opcodes/create.rs b/bus-mapping/src/evm/opcodes/create.rs
index a9842dce404..277da2431f6 100644
--- a/bus-mapping/src/evm/opcodes/create.rs
+++ b/bus-mapping/src/evm/opcodes/create.rs
@@ -376,8 +376,8 @@ mod tests {
         .unwrap()
         .into();
 
-        let mut builder = BlockData::new_from_geth_data(block.clone()).new_circuit_input_builder();
-        builder
+        let builder = BlockData::new_from_geth_data(block.clone()).new_circuit_input_builder();
+        let builder = builder
             .handle_block(&block.eth_block, &block.geth_traces)
             .unwrap();
 
diff --git a/zkevm-circuits/src/evm_circuit/execution/end_tx.rs b/zkevm-circuits/src/evm_circuit/execution/end_tx.rs
index d91873b5605..15365a36a2f 100644
--- a/zkevm-circuits/src/evm_circuit/execution/end_tx.rs
+++ b/zkevm-circuits/src/evm_circuit/execution/end_tx.rs
@@ -309,7 +309,7 @@ impl<F: Field> ExecutionGadget<F> for EndTxGadget<F> {
 #[cfg(test)]
 mod test {
     use crate::test_util::CircuitTestBuilder;
-    use bus_mapping::circuit_input_builder::CircuitsParams;
+    use bus_mapping::circuit_input_builder::FixedCParams;
     use eth_types::{self, bytecode, Word};
     use mock::{
         eth, gwei, test_ctx::helpers::account_0_code_account_1_no_code, TestContext, MOCK_ACCOUNTS,
diff --git a/zkevm-circuits/src/root_circuit/test.rs b/zkevm-circuits/src/root_circuit/test.rs
index 625abb069f2..544fa5c92d6 100644
--- a/zkevm-circuits/src/root_circuit/test.rs
+++ b/zkevm-circuits/src/root_circuit/test.rs
@@ -3,7 +3,7 @@ use crate::{
     root_circuit::{compile, Config, Gwc, PoseidonTranscript, RootCircuit},
     super_circuit::{test::block_1tx, SuperCircuit},
 };
-use bus_mapping::circuit_input_builder::CircuitsParams;
+use bus_mapping::circuit_input_builder::FixedCParams;
 use halo2_proofs::{
     circuit::Value,
     dev::MockProver,
diff --git a/zkevm-circuits/src/super_circuit.rs b/zkevm-circuits/src/super_circuit.rs
index 0861dd2cecd..2cc0d5a6084 100644
--- a/zkevm-circuits/src/super_circuit.rs
+++ b/zkevm-circuits/src/super_circuit.rs
@@ -465,7 +465,7 @@ impl<F: Field> SuperCircuit<F> {
         builder: &CircuitInputBuilder<FixedCParams>,
         mock_randomness: F,
     ) -> Result<(u32, Self, Vec<Vec<F>>), bus_mapping::Error> {
-        let mut block = block_convert(&builder).unwrap();
+        let mut block = block_convert(builder).unwrap();
         block.randomness = mock_randomness;
 
         let (_, rows_needed) = Self::min_num_rows_block(&block);