Move external-tracer from bus-mapping to a new crate only for test

Cargo.toml

@@ -6,7 +6,8 @@ members = [
     "geth-utils",
     "integration-tests",
     "circuit-benchmarks",
-    "eth-types"
+    "eth-types",
+    "external-tracer"
 ]
 
 [patch.crates-io]

bus-mapping/Cargo.toml

@@ -8,7 +8,6 @@ authors = ["CPerezz <c.perezbaro@gmail.com>"]
 eth-types = { path = "../eth-types" }
 ethers-core = "0.6"
 ethers-providers = "0.6"
-geth-utils = { path = "../geth-utils" }
 itertools = "0.10"
 lazy_static = "1.4"
 log = "0.4.14"
@@ -17,6 +16,7 @@ serde = {version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.66"
 
 [dev-dependencies]
-url = "2.2.2"
-tokio = { version = "1.13", features = ["macros"] }
+external-tracer = { path = "../external-tracer" }
 pretty_assertions = "1.0.0"
+tokio = { version = "1.13", features = ["macros"] }
+url = "2.2.2"

bus-mapping/src/circuit_input_builder.rs

@@ -2,7 +2,6 @@
 //! types from geth / web3 and outputs the circuit inputs.
 use crate::evm::opcodes::gen_associated_ops;
 use crate::exec_trace::OperationRef;
-use crate::external_tracer::BlockConstants;
 use crate::geth_errors::*;
 use crate::operation::container::OperationContainer;
 use crate::operation::{MemoryOp, Op, Operation, RWCounter, StackOp, RW};
@@ -12,6 +11,7 @@ use core::fmt::Debug;
 use eth_types::evm_types::{
     Gas, GasCost, MemoryAddress, OpcodeId, ProgramCounter, StackAddress,
 };
+use eth_types::geth_types::BlockConstants;
 use eth_types::{
     self, Address, ChainConstants, GethExecStep, GethExecTrace, Hash,
     ToAddress, ToBigEndian, Word,

bus-mapping/src/lib.rs

@@ -55,8 +55,8 @@
 //!     self, Address, Word, Hash, U64, GethExecTrace, GethExecStep, ChainConstants
 //! };
 //! use eth_types::evm_types::Gas;
+//! use eth_types::geth_types::BlockConstants;
 //! use bus_mapping::circuit_input_builder::CircuitInputBuilder;
-//! use bus_mapping::external_tracer::BlockConstants;
 //! use pairing::arithmetic::FieldExt;
 //!
 //! let input_trace = r#"
@@ -112,8 +112,8 @@
 //! };
 //!
 //! // We use some mock data as context for the trace
-//! let eth_block = mock::new_block();
-//! let eth_tx = mock::new_tx(&eth_block);
+//! let eth_block = external_tracer::new_block();
+//! let eth_tx = external_tracer::new_tx(&eth_block);
 //! let mut sdb = StateDB::new();
 //! sdb.set_account(&Address::zero(), state_db::Account::zero());
 //!
@@ -220,7 +220,6 @@
 extern crate alloc;
 pub mod evm;
 pub mod exec_trace;
-pub mod external_tracer;
 pub mod operation;
 #[macro_use]
 pub mod bytecode;