test: only new engine

bnb-chain · Oct 16, 2024 · f58bef3 · f58bef3
1 parent 0163acc
commit f58bef3
Show file tree

Hide file tree

Showing 60 changed files with 1,300 additions and 454 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -61,7 +61,7 @@ jobs:
         name: Run tests
         run: |
           cargo nextest run \
-            --locked -p reth-node-bsc --features "bsc ${{ matrix.extra-features }}" \
+            --locked -p reth-bsc-node --features "bsc ${{ matrix.extra-features }}" \
             -E "kind(test)"
 
   integration-success:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,8 +17,9 @@ members = [
     "crates/bsc/chainspec",
     "crates/bsc/cli",
     "crates/bsc/consensus",
-    "crates/bsc/node/",
     "crates/bsc/evm/",
+    "crates/bsc/node/",
+    "crates/bsc/rpc/",
     "crates/chainspec/",
     "crates/cli/cli/",
     "crates/cli/commands/",
@@ -305,6 +306,9 @@ reth-bsc-chainspec = { path = "crates/bsc/chainspec" }
 reth-bsc-forks = { path = "crates/bsc/hardforks" }
 reth-bsc-cli = { path = "crates/bsc/cli" }
 reth-bsc-consensus = { path = "crates/bsc/consensus" }
+reth-bsc-evm = { path = "crates/bsc/evm" }
+reth-bsc-node = { path = "crates/bsc/node" }
+reth-bsc-rpc = { path = "crates/bsc/rpc" }
 reth-blockchain-tree = { path = "crates/blockchain-tree" }
 reth-blockchain-tree-api = { path = "crates/blockchain-tree-api" }
 reth-chain-state = { path = "crates/chain-state" }
@@ -344,9 +348,7 @@ reth-ethereum-forks = { path = "crates/ethereum-forks" }
 reth-ethereum-payload-builder = { path = "crates/ethereum/payload" }
 reth-etl = { path = "crates/etl" }
 reth-evm = { path = "crates/evm" }
-reth-evm-bsc = { path = "crates/bsc/evm" }
 reth-evm-ethereum = { path = "crates/ethereum/evm" }
-reth-optimism-evm = { path = "crates/optimism/evm" }
 reth-execution-errors = { path = "crates/evm/execution-errors" }
 reth-execution-types = { path = "crates/evm/execution-types" }
 reth-exex = { path = "crates/exex/exex" }
@@ -368,17 +370,17 @@ reth-network-types = { path = "crates/net/network-types" }
 reth-nippy-jar = { path = "crates/storage/nippy-jar" }
 reth-node-api = { path = "crates/node/api" }
 reth-node-builder = { path = "crates/node/builder" }
-reth-node-bsc = { path = "crates/bsc/node" }
 reth-node-core = { path = "crates/node/core" }
 reth-node-ethereum = { path = "crates/ethereum/node" }
 reth-node-events = { path = "crates/node/events" }
 reth-node-metrics = { path = "crates/node/metrics" }
-reth-optimism-node = { path = "crates/optimism/node" }
 reth-node-types = { path = "crates/node/types" }
 reth-optimism-chainspec = { path = "crates/optimism/chainspec" }
 reth-optimism-cli = { path = "crates/optimism/cli" }
 reth-optimism-consensus = { path = "crates/optimism/consensus" }
+reth-optimism-evm = { path = "crates/optimism/evm" }
 reth-optimism-forks = { path = "crates/optimism/hardforks" }
+reth-optimism-node = { path = "crates/optimism/node" }
 reth-optimism-payload-builder = { path = "crates/optimism/payload" }
 reth-optimism-primitives = { path = "crates/optimism/primitives" }
 reth-optimism-rpc = { path = "crates/optimism/rpc" }

diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml
@@ -69,10 +69,10 @@ reth-node-metrics.workspace = true
 reth-consensus.workspace = true
 reth-engine-util.workspace = true
 reth-prune.workspace = true
-reth-node-bsc = { workspace = true, optional = true, features = [
+reth-bsc-node = { workspace = true, optional = true, features = [
     "bsc",
 ] }
-reth-evm-bsc = { workspace = true, optional = true, features = [
+reth-bsc-evm = { workspace = true, optional = true, features = [
     "bsc",
 ] }
 
@@ -137,8 +137,8 @@ bsc = [
     "reth-stages/bsc",
     "reth-node-builder/bsc",
     "reth-beacon-consensus/bsc",
-    "reth-node-bsc/bsc",
-    "reth-evm-bsc/bsc",
+    "reth-bsc-node/bsc",
+    "reth-bsc-evm/bsc",
 ]
 
 # no-op feature flag for switching between the `optimism` and default functionality in CI matrices

diff --git a/bin/reth/src/commands/debug_cmd/build_block.rs b/bin/reth/src/commands/debug_cmd/build_block.rs
@@ -21,7 +21,7 @@ use reth_consensus::Consensus;
 use reth_errors::RethResult;
 use reth_evm::execute::{BlockExecutorProvider, Executor};
 #[cfg(feature = "bsc")]
-use reth_evm_bsc::{BscEvmConfig, BscExecutorProvider};
+use reth_bsc_evm::{BscEvmConfig, BscExecutorProvider};
 use reth_execution_types::ExecutionOutcome;
 use reth_fs_util as fs;
 use reth_node_api::{NodeTypesWithDB, NodeTypesWithEngine, PayloadBuilderAttributes};

diff --git a/bin/reth/src/commands/debug_cmd/execution.rs b/bin/reth/src/commands/debug_cmd/execution.rs
@@ -24,7 +24,7 @@ use reth_network_p2p::{headers::client::HeadersClient, BlockClient};
 use reth_node_api::{NodeTypesWithDB, NodeTypesWithDBAdapter, NodeTypesWithEngine};
 
 #[cfg(feature = "bsc")]
-use reth_evm_bsc::BscExecutorProvider;
+use reth_bsc_evm::BscExecutorProvider;
 #[cfg(not(feature = "bsc"))]
 use reth_node_ethereum::EthExecutorProvider;
 use reth_primitives::BlockHashOrNumber;

diff --git a/bin/reth/src/commands/debug_cmd/in_memory_merkle.rs b/bin/reth/src/commands/debug_cmd/in_memory_merkle.rs
@@ -15,7 +15,7 @@ use reth_config::Config;
 use reth_errors::BlockValidationError;
 use reth_evm::execute::{BlockExecutorProvider, Executor};
 #[cfg(feature = "bsc")]
-use reth_evm_bsc::BscExecutorProvider;
+use reth_bsc_evm::BscExecutorProvider;
 use reth_execution_types::ExecutionOutcome;
 use reth_network::NetworkHandle;
 use reth_network_api::NetworkInfo;