node: move KV API client/server to db (#2089)

erigontech · Jun 11, 2024 · 30d4252 · 30d4252
1 parent 11195c2
commit 30d4252
Show file tree

Hide file tree

Showing 39 changed files with 15 additions and 18 deletions.
diff --git a/silkworm/node/remote/kv/api/client.hpp → silkworm/db/remote/kv/api/client.hpp b/silkworm/node/remote/kv/api/client.hpp → silkworm/db/remote/kv/api/client.hpp
diff --git a/...worm/node/remote/kv/api/direct_client.cpp → silkworm/db/remote/kv/api/direct_client.cpp b/...worm/node/remote/kv/api/direct_client.cpp → silkworm/db/remote/kv/api/direct_client.cpp
diff --git a/...worm/node/remote/kv/api/direct_client.hpp → silkworm/db/remote/kv/api/direct_client.hpp b/...worm/node/remote/kv/api/direct_client.hpp → silkworm/db/remote/kv/api/direct_client.hpp
diff --git a/...orm/node/remote/kv/api/direct_service.cpp → silkworm/db/remote/kv/api/direct_service.cpp b/...orm/node/remote/kv/api/direct_service.cpp → silkworm/db/remote/kv/api/direct_service.cpp
diff --git a/...orm/node/remote/kv/api/direct_service.hpp → silkworm/db/remote/kv/api/direct_service.hpp b/...orm/node/remote/kv/api/direct_service.hpp → silkworm/db/remote/kv/api/direct_service.hpp
diff --git a/...rm/node/remote/kv/api/endpoint/common.hpp → ...worm/db/remote/kv/api/endpoint/common.hpp b/...rm/node/remote/kv/api/endpoint/common.hpp → ...worm/db/remote/kv/api/endpoint/common.hpp
diff --git a/...remote/kv/api/endpoint/temporal_point.hpp → ...remote/kv/api/endpoint/temporal_point.hpp b/...remote/kv/api/endpoint/temporal_point.hpp → ...remote/kv/api/endpoint/temporal_point.hpp
diff --git a/...remote/kv/api/endpoint/temporal_range.hpp → ...remote/kv/api/endpoint/temporal_range.hpp b/...remote/kv/api/endpoint/temporal_range.hpp → ...remote/kv/api/endpoint/temporal_range.hpp
diff --git a/silkworm/node/remote/kv/api/service.hpp → silkworm/db/remote/kv/api/service.hpp b/silkworm/node/remote/kv/api/service.hpp → silkworm/db/remote/kv/api/service.hpp
diff --git a/...v/grpc/client/endpoint/temporal_point.cpp → ...v/grpc/client/endpoint/temporal_point.cpp b/...v/grpc/client/endpoint/temporal_point.cpp → ...v/grpc/client/endpoint/temporal_point.cpp
diff --git a/...v/grpc/client/endpoint/temporal_point.hpp → ...v/grpc/client/endpoint/temporal_point.hpp b/...v/grpc/client/endpoint/temporal_point.hpp → ...v/grpc/client/endpoint/temporal_point.hpp
diff --git a/...c/client/endpoint/temporal_point_test.cpp → ...c/client/endpoint/temporal_point_test.cpp b/...c/client/endpoint/temporal_point_test.cpp → ...c/client/endpoint/temporal_point_test.cpp
@@ -18,7 +18,7 @@
 
 #include <catch2/catch.hpp>
 
-#include <silkworm/node/test_util/fixture.hpp>
+#include <silkworm/infra/test_util/fixture.hpp>
 
 #include "../../test_util/sample_protos.hpp"
 

diff --git a/...v/grpc/client/endpoint/temporal_range.cpp → ...v/grpc/client/endpoint/temporal_range.cpp b/...v/grpc/client/endpoint/temporal_range.cpp → ...v/grpc/client/endpoint/temporal_range.cpp
diff --git a/...v/grpc/client/endpoint/temporal_range.hpp → ...v/grpc/client/endpoint/temporal_range.hpp b/...v/grpc/client/endpoint/temporal_range.hpp → ...v/grpc/client/endpoint/temporal_range.hpp
diff --git a/...c/client/endpoint/temporal_range_test.cpp → ...c/client/endpoint/temporal_range_test.cpp b/...c/client/endpoint/temporal_range_test.cpp → ...c/client/endpoint/temporal_range_test.cpp
@@ -18,7 +18,7 @@
 
 #include <catch2/catch.hpp>
 
-#include <silkworm/node/test_util/fixture.hpp>
+#include <silkworm/infra/test_util/fixture.hpp>
 
 #include "../../test_util/sample_protos.hpp"
 

diff --git a/...e/remote/kv/grpc/client/remote_client.cpp → ...b/remote/kv/grpc/client/remote_client.cpp b/...e/remote/kv/grpc/client/remote_client.cpp → ...b/remote/kv/grpc/client/remote_client.cpp
diff --git a/...e/remote/kv/grpc/client/remote_client.hpp → ...b/remote/kv/grpc/client/remote_client.hpp b/...e/remote/kv/grpc/client/remote_client.hpp → ...b/remote/kv/grpc/client/remote_client.hpp
diff --git a/...ote/kv/grpc/client/remote_client_test.cpp → ...ote/kv/grpc/client/remote_client_test.cpp b/...ote/kv/grpc/client/remote_client_test.cpp → ...ote/kv/grpc/client/remote_client_test.cpp
diff --git a/...m/node/remote/kv/grpc/server/kv_calls.cpp → ...orm/db/remote/kv/grpc/server/kv_calls.cpp b/...m/node/remote/kv/grpc/server/kv_calls.cpp → ...orm/db/remote/kv/grpc/server/kv_calls.cpp
diff --git a/...m/node/remote/kv/grpc/server/kv_calls.hpp → ...orm/db/remote/kv/grpc/server/kv_calls.hpp b/...m/node/remote/kv/grpc/server/kv_calls.hpp → ...orm/db/remote/kv/grpc/server/kv_calls.hpp
diff --git a/...e/remote/kv/grpc/server/kv_calls_test.cpp → ...b/remote/kv/grpc/server/kv_calls_test.cpp b/...e/remote/kv/grpc/server/kv_calls_test.cpp → ...b/remote/kv/grpc/server/kv_calls_test.cpp
diff --git a/.../node/remote/kv/grpc/server/kv_server.cpp → ...rm/db/remote/kv/grpc/server/kv_server.cpp b/.../node/remote/kv/grpc/server/kv_server.cpp → ...rm/db/remote/kv/grpc/server/kv_server.cpp
diff --git a/.../node/remote/kv/grpc/server/kv_server.hpp → ...rm/db/remote/kv/grpc/server/kv_server.hpp b/.../node/remote/kv/grpc/server/kv_server.hpp → ...rm/db/remote/kv/grpc/server/kv_server.hpp
diff --git a/.../remote/kv/grpc/server/kv_server_test.cpp → .../remote/kv/grpc/server/kv_server_test.cpp b/.../remote/kv/grpc/server/kv_server_test.cpp → .../remote/kv/grpc/server/kv_server_test.cpp
@@ -38,8 +38,9 @@
 #include <silkworm/infra/test_util/log.hpp>
 #include <silkworm/interfaces/remote/kv.pb.h>
 #include <silkworm/interfaces/types/types.pb.h>
-#include <silkworm/node/remote/kv/grpc/server/kv_calls.hpp>
-#include <silkworm/node/remote/kv/grpc/server/state_change_collection.hpp>
+
+#include "kv_calls.hpp"
+#include "state_change_collection.hpp"
 
 using namespace std::chrono_literals;
 

diff --git a/...v/grpc/server/state_change_collection.cpp → ...v/grpc/server/state_change_collection.cpp b/...v/grpc/server/state_change_collection.cpp → ...v/grpc/server/state_change_collection.cpp
diff --git a/...v/grpc/server/state_change_collection.hpp → ...v/grpc/server/state_change_collection.hpp b/...v/grpc/server/state_change_collection.hpp → ...v/grpc/server/state_change_collection.hpp
diff --git a/...c/server/state_change_collection_test.cpp → ...c/server/state_change_collection_test.cpp b/...c/server/state_change_collection_test.cpp → ...c/server/state_change_collection_test.cpp
diff --git a/...emote/kv/grpc/test_util/sample_protos.hpp → ...emote/kv/grpc/test_util/sample_protos.hpp b/...emote/kv/grpc/test_util/sample_protos.hpp → ...emote/kv/grpc/test_util/sample_protos.hpp
diff --git a/silkworm/node/test_util/fixture.hpp → silkworm/infra/test_util/fixture.hpp b/silkworm/node/test_util/fixture.hpp → silkworm/infra/test_util/fixture.hpp
diff --git a/silkworm/node/backend/ethereum_backend.hpp b/silkworm/node/backend/ethereum_backend.hpp
@@ -23,8 +23,8 @@
 
 #include <silkworm/core/chain/config.hpp>
 #include <silkworm/core/common/base.hpp>
+#include <silkworm/db/remote/kv/grpc/server/state_change_collection.hpp>
 #include <silkworm/node/common/node_settings.hpp>
-#include <silkworm/node/remote/kv/grpc/server/state_change_collection.hpp>
 #include <silkworm/sentry/api/common/sentry_client.hpp>
 
 namespace silkworm {

diff --git a/silkworm/node/execution/grpc/client/endpoint/checkers_test.cpp b/silkworm/node/execution/grpc/client/endpoint/checkers_test.cpp
@@ -23,8 +23,8 @@
 #include <intx/intx.hpp>
 
 #include <silkworm/infra/grpc/common/conversion.hpp>
+#include <silkworm/infra/test_util/fixture.hpp>
 #include <silkworm/interfaces/execution/execution.pb.h>
-#include <silkworm/node/test_util/fixture.hpp>
 
 #include "../../test_util/sample_protos.hpp"
 

diff --git a/silkworm/node/execution/grpc/client/endpoint/getters_test.cpp b/silkworm/node/execution/grpc/client/endpoint/getters_test.cpp
@@ -22,8 +22,8 @@
 #include <intx/intx.hpp>
 
 #include <silkworm/infra/grpc/common/conversion.hpp>
+#include <silkworm/infra/test_util/fixture.hpp>
 #include <silkworm/interfaces/execution/execution.pb.h>
-#include <silkworm/node/test_util/fixture.hpp>
 #include <silkworm/node/test_util/sample_blocks.hpp>
 
 #include "../../test_util/sample_protos.hpp"

diff --git a/silkworm/node/execution/grpc/client/endpoint/insertion_test.cpp b/silkworm/node/execution/grpc/client/endpoint/insertion_test.cpp
@@ -21,8 +21,8 @@
 #include <catch2/catch.hpp>
 #include <intx/intx.hpp>
 
+#include <silkworm/infra/test_util/fixture.hpp>
 #include <silkworm/interfaces/execution/execution.pb.h>
-#include <silkworm/node/test_util/fixture.hpp>
 #include <silkworm/node/test_util/sample_blocks.hpp>
 
 #include "../../test_util/sample_protos.hpp"

diff --git a/silkworm/node/execution/grpc/common/block_test.cpp b/silkworm/node/execution/grpc/common/block_test.cpp
@@ -20,8 +20,7 @@
 
 #include <catch2/catch.hpp>
 
-#include <silkworm/core/common/bytes_to_string.hpp>
-#include <silkworm/node/test_util/fixture.hpp>
+#include <silkworm/infra/test_util/fixture.hpp>
 #include <silkworm/node/test_util/sample_blocks.hpp>
 
 #include "../test_util/sample_protos.hpp"

diff --git a/silkworm/node/execution/grpc/server/endpoint/checkers_test.cpp b/silkworm/node/execution/grpc/server/endpoint/checkers_test.cpp
@@ -23,8 +23,8 @@
 #include <intx/intx.hpp>
 
 #include <silkworm/infra/grpc/common/conversion.hpp>
+#include <silkworm/infra/test_util/fixture.hpp>
 #include <silkworm/interfaces/execution/execution.pb.h>
-#include <silkworm/node/test_util/fixture.hpp>
 
 #include "../../test_util/sample_protos.hpp"
 

diff --git a/silkworm/node/execution/grpc/server/endpoint/getters_test.cpp b/silkworm/node/execution/grpc/server/endpoint/getters_test.cpp
@@ -22,8 +22,8 @@
 #include <intx/intx.hpp>
 
 #include <silkworm/infra/grpc/common/conversion.hpp>
+#include <silkworm/infra/test_util/fixture.hpp>
 #include <silkworm/interfaces/execution/execution.pb.h>
-#include <silkworm/node/test_util/fixture.hpp>
 #include <silkworm/node/test_util/sample_blocks.hpp>
 
 #include "../../test_util/sample_protos.hpp"

diff --git a/silkworm/node/execution/grpc/server/endpoint/insertion_test.cpp b/silkworm/node/execution/grpc/server/endpoint/insertion_test.cpp
@@ -21,8 +21,8 @@
 #include <catch2/catch.hpp>
 #include <intx/intx.hpp>
 
+#include <silkworm/infra/test_util/fixture.hpp>
 #include <silkworm/interfaces/execution/execution.pb.h>
-#include <silkworm/node/test_util/fixture.hpp>
 #include <silkworm/node/test_util/sample_blocks.hpp>
 
 #include "../../test_util/sample_protos.hpp"

diff --git a/silkworm/node/remote/ethbackend/grpc/server/backend_kv_server.cpp b/silkworm/node/remote/ethbackend/grpc/server/backend_kv_server.cpp
@@ -16,11 +16,8 @@
 
 #include "backend_kv_server.hpp"
 
-#include <silkworm/infra/concurrency/task.hpp>
-
-#include <silkworm/infra/common/log.hpp>
+#include <silkworm/db/remote/kv/grpc/server/kv_calls.hpp>
 #include <silkworm/node/remote/ethbackend/grpc/server/backend_calls.hpp>
-#include <silkworm/node/remote/kv/grpc/server/kv_calls.hpp>
 
 namespace silkworm::rpc {
 

diff --git a/silkworm/node/remote/ethbackend/grpc/server/backend_kv_server.hpp b/silkworm/node/remote/ethbackend/grpc/server/backend_kv_server.hpp
@@ -17,9 +17,9 @@
 #pragma once
 
 #include <silkworm/core/chain/config.hpp>
+#include <silkworm/db/remote/kv/grpc/server/kv_server.hpp>
 #include <silkworm/node/backend/ethereum_backend.hpp>
 #include <silkworm/node/remote/ethbackend/grpc/server/backend_server.hpp>
-#include <silkworm/node/remote/kv/grpc/server/kv_server.hpp>
 
 namespace silkworm::rpc {