Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rpcdaemon: move transaction/cursor hierarchy to db #2136

Merged
merged 7 commits into from
Jun 25, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
db: move transaction/cursor
canepat committed Jun 24, 2024
commit 1dfca4a701cc62d8c15cd9c2c7ac57e84a6fdc89
2 changes: 1 addition & 1 deletion silkworm/db/chain/chain.hpp
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
#include <intx/intx.hpp>
#include <nlohmann/json.hpp>

#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>

namespace silkworm::db::chain {

2 changes: 1 addition & 1 deletion silkworm/db/chain/remote_chain_storage.hpp
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@

#include <agrpc/grpc_context.hpp>

#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>

#include "chain_storage.hpp"

2 changes: 1 addition & 1 deletion silkworm/db/remote/kv/api/base_transaction.hpp
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@

#include <functional>

#include "endpoint/transaction.hpp"
#include "state_cache.hpp"
#include "transaction.hpp"

namespace silkworm::db::kv::api {

Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@

#include <silkworm/core/common/util.hpp>

#include "key_value.hpp"
#include "endpoint/key_value.hpp"

namespace silkworm::db::kv::api {

2 changes: 1 addition & 1 deletion silkworm/db/remote/kv/api/local_cursor.hpp
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
#include <silkworm/core/common/util.hpp>
#include <silkworm/db/mdbx/mdbx.hpp>

#include "endpoint/cursor.hpp"
#include "cursor.hpp"
#include "util.hpp"

namespace silkworm::db::kv::api {
2 changes: 1 addition & 1 deletion silkworm/db/remote/kv/api/local_transaction.hpp
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
#include <silkworm/db/mdbx/mdbx.hpp>

#include "base_transaction.hpp"
#include "endpoint/cursor.hpp"
#include "cursor.hpp"
#include "local_cursor.hpp"
#include "state_cache.hpp"

1 change: 1 addition & 0 deletions silkworm/db/remote/kv/api/service.hpp
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@
#include "endpoint/temporal_point.hpp"
#include "endpoint/temporal_range.hpp"
#include "endpoint/version.hpp"
#include "transaction.hpp"

namespace silkworm::kv::api {

2 changes: 1 addition & 1 deletion silkworm/db/remote/kv/api/state_cache.hpp
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@
#include <silkworm/core/common/bytes.hpp>
#include <silkworm/interfaces/remote/kv.pb.h> // weird but currently needed

#include "endpoint/transaction.hpp"
#include "transaction.hpp"
#include "util.hpp"

namespace silkworm::db::kv::api {
Original file line number Diff line number Diff line change
@@ -24,7 +24,9 @@
#include <silkworm/core/common/util.hpp>
#include <silkworm/core/state/state.hpp>
#include <silkworm/db/chain/chain_storage.hpp>
#include <silkworm/db/remote/kv/api/endpoint/cursor.hpp>

#include "cursor.hpp"
#include "endpoint/key_value.hpp"

namespace silkworm::db::kv::api {

2 changes: 1 addition & 1 deletion silkworm/db/remote/kv/grpc/client/remote_cursor.hpp
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
#include <silkworm/core/common/util.hpp>
#include <silkworm/db/remote/kv/api/util.hpp>

#include "../../api/endpoint/cursor.hpp"
#include "../../api/cursor.hpp"
#include "rpc.hpp"

namespace silkworm::db::kv::grpc::client {
2 changes: 1 addition & 1 deletion silkworm/db/remote/kv/grpc/client/remote_transaction.hpp
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@

#include <silkworm/db/chain/remote_chain_storage.hpp>
#include <silkworm/db/remote/kv/api/base_transaction.hpp>
#include <silkworm/db/remote/kv/api/endpoint/cursor.hpp>
#include <silkworm/db/remote/kv/api/cursor.hpp>

#include "remote_cursor.hpp"
#include "rpc.hpp"
2 changes: 1 addition & 1 deletion silkworm/db/state/remote_state.hpp
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@
#include <silkworm/core/common/util.hpp>
#include <silkworm/core/state/state.hpp>
#include <silkworm/db/chain/chain_storage.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/db/state/state_reader.hpp>

namespace silkworm::db::state {
2 changes: 1 addition & 1 deletion silkworm/db/state/state_reader.hpp
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@

#include <silkworm/core/common/bytes.hpp>
#include <silkworm/core/types/account.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>

namespace silkworm::db::state {

2 changes: 1 addition & 1 deletion silkworm/db/test_util/mock_cursor.hpp
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@

#include <gmock/gmock.h>

#include <silkworm/db/remote/kv/api/endpoint/cursor.hpp>
#include <silkworm/db/remote/kv/api/cursor.hpp>

namespace silkworm::db::test_util {

4 changes: 2 additions & 2 deletions silkworm/db/test_util/mock_transaction.hpp
Original file line number Diff line number Diff line change
@@ -25,8 +25,8 @@

#include <silkworm/core/common/base.hpp>
#include <silkworm/db/chain/chain_storage.hpp>
#include <silkworm/db/remote/kv/api/endpoint/cursor.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/cursor.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>

namespace silkworm::db::test_util {

2 changes: 1 addition & 1 deletion silkworm/rpc/commands/debug_api.hpp
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@
#include <nlohmann/json.hpp>

#include <silkworm/core/common/block_cache.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/state_cache.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/infra/concurrency/private_service.hpp>
#include <silkworm/infra/concurrency/shared_service.hpp>
#include <silkworm/rpc/common/worker_pool.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/commands/debug_api_test.cpp
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@

#include <silkworm/db/chain/chain_storage.hpp>
#include <silkworm/db/remote/kv/api/base_transaction.hpp>
#include <silkworm/db/remote/kv/api/endpoint/cursor.hpp>
#include <silkworm/db/remote/kv/api/cursor.hpp>
#include <silkworm/db/remote/kv/api/state_cache.hpp>
#include <silkworm/infra/common/log.hpp>
#include <silkworm/infra/concurrency/shared_service.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/commands/ots_api.hpp
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
#include <silkworm/core/common/block_cache.hpp>
#include <silkworm/core/common/bytes.hpp>
#include <silkworm/db/mdbx/bitmap.hpp>
#include <silkworm/db/remote/kv/api/endpoint/cursor.hpp>
#include <silkworm/db/remote/kv/api/cursor.hpp>
#include <silkworm/db/remote/kv/api/endpoint/key_value.hpp>
#include <silkworm/db/remote/kv/api/state_cache.hpp>
#include <silkworm/infra/concurrency/private_service.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/core/account_dumper.cpp
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
#include <silkworm/core/trie/hash_builder.hpp>
#include <silkworm/core/trie/nibbles.hpp>
#include <silkworm/core/types/address.hpp>
#include <silkworm/db/remote/kv/api/endpoint/cursor.hpp>
#include <silkworm/db/remote/kv/api/cursor.hpp>
#include <silkworm/db/state/state_reader.hpp>
#include <silkworm/db/tables.hpp>
#include <silkworm/db/util.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/core/account_dumper.hpp
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@

#include <silkworm/core/common/util.hpp>
#include <silkworm/core/types/account.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/db/remote/kv/api/util.hpp>
#include <silkworm/rpc/common/util.hpp>
#include <silkworm/rpc/core/cached_chain.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/core/account_dumper_test.cpp
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
#include <silkworm/core/rlp/encode.hpp>
#include <silkworm/db/chain/chain_storage.hpp>
#include <silkworm/db/remote/kv/api/base_transaction.hpp>
#include <silkworm/db/remote/kv/api/endpoint/cursor.hpp>
#include <silkworm/db/remote/kv/api/cursor.hpp>
#include <silkworm/rpc/ethdb/database.hpp>

namespace silkworm::rpc {
2 changes: 1 addition & 1 deletion silkworm/rpc/core/account_walker.hpp
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
#include <silkworm/core/common/util.hpp>
#include <silkworm/core/types/account.hpp>
#include <silkworm/db/remote/kv/api/endpoint/key_value.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/rpc/common/util.hpp>
#include <silkworm/rpc/ethdb/database.hpp>
#include <silkworm/rpc/ethdb/split_cursor.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/core/account_walker_test.cpp
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
#include <silkworm/core/rlp/encode.hpp>
#include <silkworm/db/chain/chain_storage.hpp>
#include <silkworm/db/remote/kv/api/base_transaction.hpp>
#include <silkworm/db/remote/kv/api/endpoint/cursor.hpp>
#include <silkworm/db/remote/kv/api/cursor.hpp>
#include <silkworm/rpc/common/worker_pool.hpp>
#include <silkworm/rpc/ethdb/database.hpp>

2 changes: 1 addition & 1 deletion silkworm/rpc/core/block_reader.cpp
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#include <silkworm/core/common/util.hpp>
#include <silkworm/core/types/account.hpp>
#include <silkworm/core/types/address.hpp>
#include <silkworm/db/remote/kv/api/endpoint/cursor.hpp>
#include <silkworm/db/remote/kv/api/cursor.hpp>
#include <silkworm/db/state/state_reader.hpp>
#include <silkworm/db/tables.hpp>
#include <silkworm/db/util.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/core/block_reader.hpp
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@
#include <silkworm/core/common/util.hpp>
#include <silkworm/core/types/account.hpp>
#include <silkworm/db/chain/chain_storage.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/rpc/common/util.hpp>
#include <silkworm/rpc/types/block.hpp>

2 changes: 1 addition & 1 deletion silkworm/rpc/core/blocks.hpp
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@

#include <silkworm/infra/concurrency/task.hpp>

#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/rpc/types/block.hpp>

namespace silkworm::rpc::core {
2 changes: 1 addition & 1 deletion silkworm/rpc/core/cached_chain.hpp
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@

#include <silkworm/core/common/block_cache.hpp>
#include <silkworm/db/chain/chain_storage.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/rpc/types/block.hpp>
#include <silkworm/rpc/types/transaction.hpp>

2 changes: 1 addition & 1 deletion silkworm/rpc/core/call_many.hpp
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@
#include <silkworm/core/common/block_cache.hpp>
#include <silkworm/core/execution/evm.hpp>
#include <silkworm/core/state/intra_block_state.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/state_cache.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/rpc/common/worker_pool.hpp>
#include <silkworm/rpc/core/evm_executor.hpp>
#include <silkworm/rpc/types/block.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/core/estimate_gas_oracle.hpp
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
#include <silkworm/core/chain/config.hpp>
#include <silkworm/core/common/util.hpp>
#include <silkworm/core/types/block.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/rpc/common/worker_pool.hpp>
#include <silkworm/rpc/core/blocks.hpp>
#include <silkworm/rpc/core/evm_executor.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/core/estimate_gas_oracle_test.cpp
Original file line number Diff line number Diff line change
@@ -28,8 +28,8 @@
#include <gmock/gmock.h>

#include <silkworm/db/chain/remote_chain_storage.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/state_cache.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/db/remote/kv/grpc/client/remote_transaction.hpp>
#include <silkworm/db/test_util/kv_test_base.hpp>
#include <silkworm/infra/test_util/log.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/core/evm_debug.hpp
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@
#include <silkworm/core/common/empty_hashes.hpp>
#include <silkworm/core/execution/evm.hpp>
#include <silkworm/core/state/intra_block_state.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/rpc/common/worker_pool.hpp>
#include <silkworm/rpc/json/stream.hpp>
#include <silkworm/rpc/types/block.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/core/evm_debug_test.cpp
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@

#include <silkworm/db/chain/remote_chain_storage.hpp>
#include <silkworm/db/remote/kv/api/endpoint/key_value.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/db/state/remote_state.hpp>
#include <silkworm/db/tables.hpp>
#include <silkworm/db/test_util/mock_transaction.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/core/evm_executor_test.cpp
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@

#include <silkworm/db/chain/remote_chain_storage.hpp>
#include <silkworm/db/remote/kv/api/endpoint/key_value.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/db/state/remote_state.hpp>
#include <silkworm/db/test_util/mock_transaction.hpp>
#include <silkworm/infra/common/log.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/core/evm_trace.hpp
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
#include <silkworm/core/common/block_cache.hpp>
#include <silkworm/core/execution/evm.hpp>
#include <silkworm/core/state/intra_block_state.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/rpc/common/worker_pool.hpp>
#include <silkworm/rpc/core/evm_executor.hpp>
#include <silkworm/rpc/json/stream.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/core/logs_walker.hpp
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
#include <boost/asio/awaitable.hpp>

#include <silkworm/core/common/block_cache.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/rpc/ethbackend/backend.hpp>
#include <silkworm/rpc/types/filter.hpp>
#include <silkworm/rpc/types/log.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/core/receipts.hpp
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
#include <evmc/evmc.hpp>

#include <silkworm/core/types/block.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/rpc/types/receipt.hpp>

namespace silkworm::rpc::core {
2 changes: 1 addition & 1 deletion silkworm/rpc/core/storage_walker.hpp
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@

#include <silkworm/core/common/util.hpp>
#include <silkworm/core/types/account.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/rpc/common/util.hpp>
#include <silkworm/rpc/ethdb/database.hpp>
#include <silkworm/rpc/types/block.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/core/storage_walker_test.cpp
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
#include <silkworm/core/types/address.hpp>
#include <silkworm/db/chain/chain_storage.hpp>
#include <silkworm/db/remote/kv/api/base_transaction.hpp>
#include <silkworm/db/remote/kv/api/endpoint/cursor.hpp>
#include <silkworm/db/remote/kv/api/cursor.hpp>
#include <silkworm/rpc/common/worker_pool.hpp>
#include <silkworm/rpc/ethdb/database.hpp>

2 changes: 1 addition & 1 deletion silkworm/rpc/ethdb/bitmap.hpp
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
#pragma GCC diagnostic pop

#include <silkworm/core/common/util.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/rpc/types/filter.hpp>

namespace silkworm::rpc::ethdb::bitmap {
2 changes: 1 addition & 1 deletion silkworm/rpc/ethdb/database.hpp
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@

#include <boost/asio/io_context.hpp>

#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>

namespace silkworm::rpc::ethdb {

2 changes: 1 addition & 1 deletion silkworm/rpc/ethdb/file/local_database.hpp
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@
#include <utility>

#include <silkworm/db/mdbx/mdbx.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/state_cache.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/rpc/ethdb/database.hpp>

namespace silkworm::rpc::ethdb::file {
2 changes: 1 addition & 1 deletion silkworm/rpc/ethdb/kv/remote_database.hpp
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@
#include <agrpc/grpc_context.hpp>
#include <grpcpp/grpcpp.h>

#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/state_cache.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/interfaces/remote/kv.grpc.pb.h>
#include <silkworm/rpc/ethbackend/remote_backend.hpp>
#include <silkworm/rpc/ethdb/database.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/ethdb/split_cursor.hpp
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
#include <silkworm/infra/concurrency/task.hpp>

#include <silkworm/core/common/util.hpp>
#include <silkworm/db/remote/kv/api/endpoint/cursor.hpp>
#include <silkworm/db/remote/kv/api/cursor.hpp>
#include <silkworm/db/remote/kv/api/endpoint/key_value.hpp>
#include <silkworm/rpc/common/util.hpp>

2 changes: 1 addition & 1 deletion silkworm/rpc/ethdb/walk.hpp
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
#include <silkworm/infra/concurrency/task.hpp>

#include <silkworm/core/common/util.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>

namespace silkworm::rpc::ethdb {

2 changes: 1 addition & 1 deletion silkworm/rpc/stagedsync/stages.hpp
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@

#include <silkworm/core/common/base.hpp>
#include <silkworm/core/common/bytes.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/db/remote/kv/api/util.hpp>
#include <silkworm/db/stages.hpp>

2 changes: 1 addition & 1 deletion silkworm/rpc/test_util/dummy_database.hpp
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@

#include <silkworm/infra/concurrency/task.hpp>

#include <silkworm/db/remote/kv/api/endpoint/cursor.hpp>
#include <silkworm/db/remote/kv/api/cursor.hpp>
#include <silkworm/rpc/common/util.hpp>
#include <silkworm/rpc/ethdb/database.hpp>
#include <silkworm/rpc/ethdb/transaction.hpp>
2 changes: 1 addition & 1 deletion silkworm/rpc/test_util/dummy_transaction.hpp
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
#include <silkworm/infra/concurrency/task.hpp>

#include <silkworm/db/remote/kv/api/base_transaction.hpp>
#include <silkworm/db/remote/kv/api/endpoint/cursor.hpp>
#include <silkworm/db/remote/kv/api/cursor.hpp>
#include <silkworm/db/state/remote_state.hpp>
#include <silkworm/rpc/common/util.hpp>

2 changes: 1 addition & 1 deletion silkworm/rpc/test_util/mock_estimate_gas_oracle.hpp
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
#include <gmock/gmock.h>

#include <silkworm/core/common/base.hpp>
#include <silkworm/db/remote/kv/api/endpoint/transaction.hpp>
#include <silkworm/db/remote/kv/api/transaction.hpp>
#include <silkworm/rpc/common/util.hpp>
#include <silkworm/rpc/core/estimate_gas_oracle.hpp>