refactor(state_keeper): Rename batch executor family of types (matter…

…-labs#1065) ## What ❔ - Does a set of renames: - `L1BatchExecutorBuilder` -> `BatchExecutor` - `MainBatchExecutorBuilder` -> `MainBatchExecutor` - `BatchExecutor` -> `CommandReceiver` (as it's just a "processing" part of `MainBatchExecutor`) - Similar changes in the framework. - Moves the implementation of `MainBatchExecutor` to a separate file. - Removes some temporary misplaced constructor for `BatchExecutorHandle`. ## Why ❔ - Less Enterprise™ - Better logical structure ## Checklist   - [ ] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [ ] Code has been formatted via `zk fmt` and `zk lint`. - [ ] Spellcheck has been run via `zk spellcheck`. - [ ] Linkcheck has been run via `zk linkcheck`.
danzid-tech · Feb 15, 2024 · e27e639 · e27e639
1 parent 82c788e
commit e27e639
Show file tree

Hide file tree

Showing 13 changed files with 472 additions and 486 deletions.
diff --git a/core/bin/external_node/src/main.rs b/core/bin/external_node/src/main.rs
@@ -25,8 +25,8 @@ use zksync_core::{
     reorg_detector::ReorgDetector,
     setup_sigint_handler,
     state_keeper::{
-        seal_criteria::NoopSealer, L1BatchExecutorBuilder, MainBatchExecutorBuilder,
-        MiniblockSealer, MiniblockSealerHandle, ZkSyncStateKeeper,
+        seal_criteria::NoopSealer, BatchExecutor, MainBatchExecutor, MiniblockSealer,
+        MiniblockSealerHandle, ZkSyncStateKeeper,
     },
     sync_layer::{
         batch_status_updater::BatchStatusUpdater, external_io::ExternalIO,
@@ -70,16 +70,15 @@ async fn build_state_keeper(
     // We only need call traces on the external node if the `debug_` namespace is enabled.
     let save_call_traces = config.optional.api_namespaces().contains(&Namespace::Debug);
 
-    let batch_executor_base: Box<dyn L1BatchExecutorBuilder> =
-        Box::new(MainBatchExecutorBuilder::new(
-            state_keeper_db_path,
-            connection_pool.clone(),
-            max_allowed_l2_tx_gas_limit,
-            save_call_traces,
-            false,
-            config.optional.enum_index_migration_chunk_size,
-            true,
-        ));
+    let batch_executor_base: Box<dyn BatchExecutor> = Box::new(MainBatchExecutor::new(
+        state_keeper_db_path,
+        connection_pool.clone(),
+        max_allowed_l2_tx_gas_limit,
+        save_call_traces,
+        false,
+        config.optional.enum_index_migration_chunk_size,
+        true,
+    ));
 
     let main_node_url = config.required.main_node_url()?;
     let main_node_client = <dyn MainNodeClient>::json_rpc(&main_node_url)

diff --git a/core/lib/zksync_core/src/consensus/testonly.rs b/core/lib/zksync_core/src/consensus/testonly.rs
@@ -24,8 +24,7 @@ use crate::{
     },
     genesis::{ensure_genesis_state, GenesisParams},
     state_keeper::{
-        seal_criteria::NoopSealer, tests::MockBatchExecutorBuilder, MiniblockSealer,
-        ZkSyncStateKeeper,
+        seal_criteria::NoopSealer, tests::MockBatchExecutor, MiniblockSealer, ZkSyncStateKeeper,
     },
     sync_layer::{
         sync_action::{ActionQueue, ActionQueueSender, SyncAction},
@@ -445,7 +444,7 @@ impl StateKeeperRunner {
                 ZkSyncStateKeeper::new(
                     stop_receiver,
                     Box::new(io),
-                    Box::new(MockBatchExecutorBuilder),
+                    Box::new(MockBatchExecutor),
                     Arc::new(NoopSealer),
                 )
                 .run(),