rpcdaemon: refactoring state access (#2129)

Author: canepat

silkworm/rpc/commands/eth_api.cpp

@@ -45,8 +45,8 @@
 #include <silkworm/rpc/core/gas_price_oracle.hpp>
 #include <silkworm/rpc/core/logs_walker.hpp>
 #include <silkworm/rpc/core/receipts.hpp>
-#include <silkworm/rpc/core/state_reader.hpp>
 #include <silkworm/rpc/stagedsync/stages.hpp>
+#include <silkworm/rpc/state/state_reader.hpp>
 
 namespace silkworm::rpc::commands {
 

silkworm/rpc/commands/ots_api.cpp

@@ -33,8 +33,8 @@
 #include <silkworm/rpc/core/cached_chain.hpp>
 #include <silkworm/rpc/core/evm_trace.hpp>
 #include <silkworm/rpc/core/receipts.hpp>
-#include <silkworm/rpc/core/state_reader.hpp>
 #include <silkworm/rpc/json/types.hpp>
+#include <silkworm/rpc/state/state_reader.hpp>
 
 namespace silkworm::rpc::commands {
 

silkworm/rpc/commands/parity_api.cpp

@@ -28,8 +28,8 @@
 #include <silkworm/rpc/core/blocks.hpp>
 #include <silkworm/rpc/core/cached_chain.hpp>
 #include <silkworm/rpc/core/receipts.hpp>
-#include <silkworm/rpc/core/state_reader.hpp>
 #include <silkworm/rpc/json/types.hpp>
+#include <silkworm/rpc/state/state_reader.hpp>
 
 namespace silkworm::rpc::commands {
 

silkworm/rpc/core/account_dumper.cpp

@@ -30,10 +30,10 @@
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/core/account_walker.hpp>
 #include <silkworm/rpc/core/cached_chain.hpp>
-#include <silkworm/rpc/core/state_reader.hpp>
 #include <silkworm/rpc/core/storage_walker.hpp>
 #include <silkworm/rpc/ethdb/cursor.hpp>
 #include <silkworm/rpc/json/types.hpp>
+#include <silkworm/rpc/state/state_reader.hpp>
 
 namespace silkworm::rpc::core {
 

silkworm/rpc/core/block_reader.cpp

@@ -25,9 +25,9 @@
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/core/cached_chain.hpp>
-#include <silkworm/rpc/core/state_reader.hpp>
 #include <silkworm/rpc/ethdb/cursor.hpp>
 #include <silkworm/rpc/json/types.hpp>
+#include <silkworm/rpc/state/state_reader.hpp>
 
 namespace silkworm::rpc {
 

silkworm/rpc/core/evm_debug_test.cpp

@@ -25,8 +25,8 @@
 
 #include <silkworm/db/tables.hpp>
 #include <silkworm/rpc/common/util.hpp>
-#include <silkworm/rpc/core/remote_state.hpp>
 #include <silkworm/rpc/ethdb/kv/backend_providers.hpp>
+#include <silkworm/rpc/state/remote_state.hpp>
 #include <silkworm/rpc/storage/remote_chain_storage.hpp>
 #include <silkworm/rpc/test_util/mock_back_end.hpp>
 #include <silkworm/rpc/test_util/mock_block_cache.hpp>

silkworm/rpc/core/evm_executor.hpp

@@ -35,7 +35,7 @@
 #include <silkworm/core/types/block.hpp>
 #include <silkworm/core/types/transaction.hpp>
 #include <silkworm/rpc/common/worker_pool.hpp>
-#include <silkworm/rpc/core/state_reader.hpp>
+#include <silkworm/rpc/state/state_reader.hpp>
 #include <silkworm/rpc/storage/chain_storage.hpp>
 
 namespace silkworm::rpc {

silkworm/rpc/core/evm_trace_test.cpp

@@ -29,8 +29,8 @@
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/test_util/log.hpp>
 #include <silkworm/rpc/common/util.hpp>
-#include <silkworm/rpc/core/remote_state.hpp>
 #include <silkworm/rpc/ethdb/kv/backend_providers.hpp>
+#include <silkworm/rpc/state/remote_state.hpp>
 #include <silkworm/rpc/storage/remote_chain_storage.hpp>
 #include <silkworm/rpc/test_util/mock_back_end.hpp>
 #include <silkworm/rpc/test_util/mock_block_cache.hpp>

silkworm/rpc/ethdb/file/local_transaction.cpp

@@ -16,7 +16,7 @@
 
 #include "local_transaction.hpp"
 
-#include <silkworm/rpc/core/local_state.hpp>
+#include <silkworm/rpc/state/local_state.hpp>
 #include <silkworm/rpc/storage/local_chain_storage.hpp>
 
 namespace silkworm::rpc::ethdb::file {

silkworm/rpc/ethdb/kv/remote_transaction.cpp

@@ -19,7 +19,7 @@
 #include <grpcpp/grpcpp.h>
 
 #include <silkworm/db/tables.hpp>
-#include <silkworm/rpc/core/remote_state.hpp>
+#include <silkworm/rpc/state/remote_state.hpp>
 
 namespace silkworm::rpc::ethdb::kv {
 

silkworm/rpc/core/local_state.cpp renamed to silkworm/rpc/state/local_state.cpp

@@ -28,7 +28,7 @@
 #include <silkworm/core/state/state.hpp>
 #include <silkworm/db/access_layer.hpp>
 #include <silkworm/db/mdbx/mdbx.hpp>
-#include <silkworm/rpc/core/state_reader.hpp>
+#include <silkworm/rpc/state/state_reader.hpp>
 
 namespace silkworm::rpc::state {
 

silkworm/rpc/core/local_state.hpp renamed to silkworm/rpc/state/local_state.hpp

@@ -28,7 +28,7 @@
 
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/state/state.hpp>
-#include <silkworm/rpc/core/state_reader.hpp>
+#include <silkworm/rpc/state/state_reader.hpp>
 #include <silkworm/rpc/storage/chain_storage.hpp>
 
 namespace silkworm::rpc::state {

silkworm/rpc/core/remote_state.cpp renamed to silkworm/rpc/state/remote_state.cpp

@@ -23,9 +23,9 @@
 #include <silkworm/infra/concurrency/task.hpp>
 
 #include <silkworm/rpc/common/util.hpp>
-#include <silkworm/rpc/core/remote_state.hpp>
 #include <silkworm/rpc/ethdb/base_transaction.hpp>
 #include <silkworm/rpc/ethdb/cursor.hpp>
+#include <silkworm/rpc/state/remote_state.hpp>
 
 namespace silkworm::rpc::test {