Fix compilation error (privacy-scaling-explorations#251)

Set github actions to trigger also on push to main.

.github/workflows/ci.yml

@@ -3,6 +3,9 @@ name: CI checks
 on:
   pull_request:
     types: [synchronize, opened, reopened, ready_for_review]
+  push:
+    branches:
+      - main
 
 ## `actions-rs/toolchain@v1` overwrite set to false so that
 ## `rust-toolchain` is always used and the only source of truth.

.github/workflows/integration.yml

@@ -3,6 +3,9 @@ name: Integration Tests
 on:
   pull_request:
     types: [synchronize, opened, reopened, ready_for_review]
+  push:
+    branches:
+      - main
 
 jobs:
   integration-tests:

.github/workflows/lints.yml

@@ -4,6 +4,9 @@ name: Lints
 on:
   pull_request:
     types: [synchronize, opened, reopened, ready_for_review]
+  push:
+    branches:
+      - main
 
 jobs:
   clippy:

bus-mapping/src/evm/opcodes/jump.rs

@@ -36,9 +36,7 @@ mod jump_tests {
     use super::*;
     use crate::{
         bytecode,
-        circuit_input_builder::{
-            CircuitInputBuilder, ExecStep, Transaction, TransactionContext,
-        },
+        circuit_input_builder::{ExecStep, TransactionContext},
         eth_types::Word,
         evm::StackAddress,
         mock,
@@ -66,15 +64,11 @@ mod jump_tests {
         let block =
             mock::BlockData::new_single_tx_trace_code_at_start(&code).unwrap();
 
-        let mut builder = CircuitInputBuilder::new(
-            &block.eth_block.clone(),
-            block.ctants.clone(),
-        );
+        let mut builder = block.new_circuit_input_builder();
         builder.handle_tx(&block.eth_tx, &block.geth_trace).unwrap();
 
-        let mut test_builder =
-            CircuitInputBuilder::new(&block.eth_block, block.ctants.clone());
-        let mut tx = Transaction::new(&block.eth_tx);
+        let mut test_builder = block.new_circuit_input_builder();
+        let mut tx = test_builder.new_tx(&block.eth_tx).unwrap();
         let mut tx_ctx = TransactionContext::new(&block.eth_tx);
 
         // Generate step corresponding to JUMP

bus-mapping/src/evm/opcodes/jumpi.rs

@@ -39,9 +39,7 @@ mod jumpi_tests {
     use super::*;
     use crate::{
         bytecode,
-        circuit_input_builder::{
-            CircuitInputBuilder, ExecStep, Transaction, TransactionContext,
-        },
+        circuit_input_builder::{ExecStep, TransactionContext},
         eth_types::Word,
         evm::StackAddress,
         mock,
@@ -72,15 +70,11 @@ mod jumpi_tests {
         let block =
             mock::BlockData::new_single_tx_trace_code_at_start(&code).unwrap();
 
-        let mut builder = CircuitInputBuilder::new(
-            &block.eth_block.clone(),
-            block.ctants.clone(),
-        );
+        let mut builder = block.new_circuit_input_builder();
         builder.handle_tx(&block.eth_tx, &block.geth_trace).unwrap();
 
-        let mut test_builder =
-            CircuitInputBuilder::new(&block.eth_block, block.ctants.clone());
-        let mut tx = Transaction::new(&block.eth_tx);
+        let mut test_builder = block.new_circuit_input_builder();
+        let mut tx = test_builder.new_tx(&block.eth_tx).unwrap();
         let mut tx_ctx = TransactionContext::new(&block.eth_tx);
 
         // Generate step corresponding to JUMP