Merge branch '2304-deduplicate-code-in-rpcevmexecutor-and-executionpr…

…ocessor' of github.com:erigontech/silkworm into 2304-deduplicate-code-in-rpcevmexecutor-and-executionprocessor
erigontech · Sep 23, 2024 · 7125556 · 7125556
2 parents b33c68f + 33c0534
commit 7125556
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/silkworm/rpc/core/evm_executor.cpp b/silkworm/rpc/core/evm_executor.cpp
@@ -270,8 +270,8 @@ ExecutionResult EVMExecutor::call(
     SILK_DEBUG << "EVMExecutor::call: blockNumber: " << block.header.number << " gas_limit: " << txn.gas_limit << " refund: " << refund
                << " gas_bailout: " << bailout << " transaction: " << rpc::Transaction{txn};
 
-    //ExecutionProcessor execution_processor{block, *rule_set_, ibs_state_.db(), config_};
-    //auto& evm = execution_processor.evm();
+    // ExecutionProcessor execution_processor{block, *rule_set_, ibs_state_.db(), config_};
+    // auto& evm = execution_processor.evm();
     auto& evm = execution_processor_.evm();
     static constexpr auto kVerifySender = false;
     if (const auto result = protocol::pre_validate_transaction(txn, evm.revision(),

diff --git a/silkworm/rpc/core/evm_executor.hpp b/silkworm/rpc/core/evm_executor.hpp
@@ -29,8 +29,8 @@
 #include <silkworm/core/chain/config.hpp>
 #include <silkworm/core/common/assert.hpp>
 #include <silkworm/core/common/util.hpp>
-#include <silkworm/core/execution/execution.hpp>
 #include <silkworm/core/execution/evm.hpp>
+#include <silkworm/core/execution/execution.hpp>
 #include <silkworm/core/protocol/rule_set.hpp>
 #include <silkworm/core/state/state.hpp>
 #include <silkworm/core/types/block.hpp>
@@ -109,8 +109,7 @@ class EVMExecutor {
           state_{std::move(state)},
           ibs_state_{*state_},
           rule_set_{protocol::rule_set_factory(config)},
-          execution_processor_{block, *rule_set_, *state_, config}
-    {
+          execution_processor_{block, *rule_set_, *state_, config} {
         SILKWORM_ASSERT(rule_set_);
         if (!has_service<AnalysisCacheService>(workers_)) {
             make_service<AnalysisCacheService>(workers_);