Skip to content

Commit 2e69b8c

Browse files
authored
snapshots: move DAL code and tests (#2065)
1 parent 08d881a commit 2e69b8c

36 files changed

+84
-90
lines changed

cmd/dev/snapshots.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@
3131
#include <silkworm/core/types/address.hpp>
3232
#include <silkworm/core/types/block_body_for_storage.hpp>
3333
#include <silkworm/core/types/evmc_bytes32.hpp>
34+
#include <silkworm/db/bodies/body_index.hpp>
35+
#include <silkworm/db/bodies/body_queries.hpp>
36+
#include <silkworm/db/headers/header_index.hpp>
37+
#include <silkworm/db/headers/header_queries.hpp>
3438
#include <silkworm/db/snapshot_bundle_factory_impl.hpp>
3539
#include <silkworm/db/snapshot_sync.hpp>
3640
#include <silkworm/db/snapshots/bittorrent/client.hpp>
37-
#include <silkworm/db/snapshots/body_index.hpp>
38-
#include <silkworm/db/snapshots/body_queries.hpp>
39-
#include <silkworm/db/snapshots/header_index.hpp>
40-
#include <silkworm/db/snapshots/header_queries.hpp>
4141
#include <silkworm/db/snapshots/repository.hpp>
4242
#include <silkworm/db/snapshots/seg/seg_zip.hpp>
4343
#include <silkworm/db/snapshots/snapshot_reader.hpp>
44-
#include <silkworm/db/snapshots/txn_index.hpp>
45-
#include <silkworm/db/snapshots/txn_queries.hpp>
46-
#include <silkworm/db/snapshots/txn_to_block_index.hpp>
44+
#include <silkworm/db/transactions/txn_index.hpp>
45+
#include <silkworm/db/transactions/txn_queries.hpp>
46+
#include <silkworm/db/transactions/txn_to_block_index.hpp>
4747
#include <silkworm/infra/common/ensure.hpp>
4848
#include <silkworm/infra/common/log.hpp>
4949

silkworm/capi/silkworm.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@
3333
#include <silkworm/core/execution/call_tracer.hpp>
3434
#include <silkworm/core/execution/execution.hpp>
3535
#include <silkworm/db/access_layer.hpp>
36+
#include <silkworm/db/bodies/body_index.hpp>
3637
#include <silkworm/db/buffer.hpp>
38+
#include <silkworm/db/headers/header_index.hpp>
3739
#include <silkworm/db/snapshot_bundle_factory_impl.hpp>
38-
#include <silkworm/db/snapshots/body_index.hpp>
39-
#include <silkworm/db/snapshots/header_index.hpp>
4040
#include <silkworm/db/snapshots/index.hpp>
4141
#include <silkworm/db/snapshots/index_builder.hpp>
4242
#include <silkworm/db/snapshots/snapshot_reader.hpp>
43-
#include <silkworm/db/snapshots/txn_index.hpp>
44-
#include <silkworm/db/snapshots/txn_to_block_index.hpp>
4543
#include <silkworm/db/stages.hpp>
44+
#include <silkworm/db/transactions/txn_index.hpp>
45+
#include <silkworm/db/transactions/txn_to_block_index.hpp>
4646
#include <silkworm/infra/common/bounded_buffer.hpp>
4747
#include <silkworm/infra/common/directories.hpp>
4848
#include <silkworm/infra/common/stopwatch.hpp>

silkworm/capi/silkworm_test.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
#include <catch2/catch.hpp>
2323

2424
#include <silkworm/core/trie/vector_root.hpp>
25+
#include <silkworm/db/bodies/body_index.hpp>
26+
#include <silkworm/db/headers/header_index.hpp>
2527
#include <silkworm/db/mdbx/mdbx.hpp>
26-
#include <silkworm/db/snapshots/body_index.hpp>
27-
#include <silkworm/db/snapshots/header_index.hpp>
2828
#include <silkworm/db/snapshots/index.hpp>
2929
#include <silkworm/db/snapshots/index_builder.hpp>
3030
#include <silkworm/db/snapshots/snapshot_reader.hpp>
31-
#include <silkworm/db/snapshots/test_util/common.hpp>
32-
#include <silkworm/db/snapshots/txn_index.hpp>
33-
#include <silkworm/db/snapshots/txn_to_block_index.hpp>
31+
#include <silkworm/db/test_util/temp_snapshots.hpp>
32+
#include <silkworm/db/transactions/txn_index.hpp>
33+
#include <silkworm/db/transactions/txn_to_block_index.hpp>
3434
#include <silkworm/infra/common/directories.hpp>
3535
#include <silkworm/rpc/test_util/api_test_database.hpp>
3636

silkworm/db/access_layer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
#include <silkworm/core/common/endian.hpp>
2525
#include <silkworm/core/types/block_body_for_storage.hpp>
2626
#include <silkworm/core/types/evmc_bytes32.hpp>
27+
#include <silkworm/db/bodies/body_queries.hpp>
28+
#include <silkworm/db/headers/header_queries.hpp>
2729
#include <silkworm/db/mdbx/bitmap.hpp>
2830
#include <silkworm/db/receipt_cbor.hpp>
29-
#include <silkworm/db/snapshots/body_queries.hpp>
30-
#include <silkworm/db/snapshots/header_queries.hpp>
3131
#include <silkworm/db/snapshots/repository.hpp>
32-
#include <silkworm/db/snapshots/txn_queries.hpp>
3332
#include <silkworm/db/tables.hpp>
33+
#include <silkworm/db/transactions/txn_queries.hpp>
3434
#include <silkworm/infra/common/decoding_exception.hpp>
3535
#include <silkworm/infra/common/ensure.hpp>
3636

silkworm/db/snapshots/body_index.hpp renamed to silkworm/db/bodies/body_index.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121
#include <optional>
2222

2323
#include <silkworm/core/common/bytes.hpp>
24+
#include <silkworm/db/snapshots/index_builder.hpp>
25+
#include <silkworm/db/snapshots/path.hpp>
2426
#include <silkworm/infra/common/memory_mapped_file.hpp>
2527

26-
#include "index_builder.hpp"
27-
#include "path.hpp"
28-
2928
namespace silkworm::snapshots {
3029

3130
class BodyIndex {

silkworm/db/snapshots/body_queries.hpp renamed to silkworm/db/bodies/body_queries.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
#pragma once
1818

19-
#include "basic_queries.hpp"
19+
#include <silkworm/db/snapshots/basic_queries.hpp>
20+
2021
#include "body_snapshot.hpp"
2122

2223
namespace silkworm::snapshots {

silkworm/db/snapshots/body_snapshot.hpp renamed to silkworm/db/bodies/body_snapshot.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
#include <silkworm/core/common/bytes.hpp>
2020
#include <silkworm/core/types/block.hpp>
2121
#include <silkworm/core/types/block_body_for_storage.hpp>
22-
23-
#include "snapshot_reader.hpp"
24-
#include "snapshot_word_serializer.hpp"
22+
#include <silkworm/db/snapshots/snapshot_reader.hpp>
23+
#include <silkworm/db/snapshots/snapshot_word_serializer.hpp>
2524

2625
namespace silkworm::snapshots {
2726

silkworm/db/snapshots/body_txs_amount_query.hpp renamed to silkworm/db/bodies/body_txs_amount_query.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include <cstdint>
2020

21-
#include "snapshot_reader.hpp"
21+
#include <silkworm/db/snapshots/snapshot_reader.hpp>
2222

2323
namespace silkworm::snapshots {
2424

silkworm/db/snapshots/body_txs_amount_query_test.cpp renamed to silkworm/db/bodies/body_txs_amount_query_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include <catch2/catch.hpp>
2020

21-
#include <silkworm/db/snapshots/test_util/common.hpp>
21+
#include <silkworm/db/test_util/temp_snapshots.hpp>
2222
#include <silkworm/infra/common/directories.hpp>
2323
#include <silkworm/infra/common/log.hpp>
2424
#include <silkworm/infra/test_util/log.hpp>

silkworm/db/snapshots/header_index.hpp renamed to silkworm/db/headers/header_index.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121
#include <optional>
2222

2323
#include <silkworm/core/common/bytes.hpp>
24+
#include <silkworm/db/snapshots/index_builder.hpp>
25+
#include <silkworm/db/snapshots/path.hpp>
2426
#include <silkworm/infra/common/memory_mapped_file.hpp>
2527

26-
#include "index_builder.hpp"
27-
#include "path.hpp"
28-
2928
namespace silkworm::snapshots {
3029

3130
class HeaderIndex {

silkworm/db/snapshots/header_queries.hpp renamed to silkworm/db/headers/header_queries.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
#pragma once
1818

19-
#include "basic_queries.hpp"
19+
#include <silkworm/db/snapshots/basic_queries.hpp>
20+
2021
#include "header_snapshot.hpp"
2122

2223
namespace silkworm::snapshots {

silkworm/db/snapshots/header_snapshot.hpp renamed to silkworm/db/headers/header_snapshot.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818

1919
#include <silkworm/core/common/bytes.hpp>
2020
#include <silkworm/core/types/block.hpp>
21-
22-
#include "snapshot_reader.hpp"
23-
#include "snapshot_word_serializer.hpp"
21+
#include <silkworm/db/snapshots/snapshot_reader.hpp>
22+
#include <silkworm/db/snapshots/snapshot_word_serializer.hpp>
2423

2524
namespace silkworm::snapshots {
2625

silkworm/db/snapshot_benchmark.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
#include <benchmark/benchmark.h>
1818

1919
#include <silkworm/core/common/util.hpp>
20+
#include <silkworm/db/bodies/body_index.hpp>
21+
#include <silkworm/db/headers/header_index.hpp>
2022
#include <silkworm/db/snapshot_bundle_factory_impl.hpp>
21-
#include <silkworm/db/snapshots/body_index.hpp>
22-
#include <silkworm/db/snapshots/header_index.hpp>
2323
#include <silkworm/db/snapshots/index_builder.hpp>
2424
#include <silkworm/db/snapshots/seg/decompressor.hpp>
25-
#include <silkworm/db/snapshots/test_util/common.hpp>
26-
#include <silkworm/db/snapshots/txn_index.hpp>
27-
#include <silkworm/db/snapshots/txn_to_block_index.hpp>
25+
#include <silkworm/db/test_util/temp_snapshots.hpp>
26+
#include <silkworm/db/transactions/txn_index.hpp>
27+
#include <silkworm/db/transactions/txn_to_block_index.hpp>
2828
#include <silkworm/infra/common/directories.hpp>
2929
#include <silkworm/infra/test_util/log.hpp>
3030
#include <silkworm/infra/test_util/temporary_file.hpp>

silkworm/db/snapshot_bundle_factory_impl.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
#include <cassert>
2020

21-
#include <silkworm/db/snapshots/body_index.hpp>
22-
#include <silkworm/db/snapshots/header_index.hpp>
23-
#include <silkworm/db/snapshots/txn_index.hpp>
24-
#include <silkworm/db/snapshots/txn_to_block_index.hpp>
21+
#include <silkworm/db/bodies/body_index.hpp>
22+
#include <silkworm/db/headers/header_index.hpp>
23+
#include <silkworm/db/transactions/txn_index.hpp>
24+
#include <silkworm/db/transactions/txn_to_block_index.hpp>
2525

2626
namespace silkworm::db {
2727

silkworm/db/snapshots/snapshot_decompressor_test.cpp renamed to silkworm/db/snapshot_decompressor_test.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@
2828

2929
#include <silkworm/core/common/endian.hpp>
3030
#include <silkworm/core/common/util.hpp>
31-
#include <silkworm/db/snapshots/test_util/common.hpp>
31+
#include <silkworm/db/snapshots/seg/decompressor.hpp>
32+
#include <silkworm/db/test_util/temp_snapshots.hpp>
3233
#include <silkworm/infra/common/directories.hpp>
3334
#include <silkworm/infra/test_util/log.hpp>
3435

35-
#include "seg/decompressor.hpp"
36-
3736
namespace silkworm::snapshots {
3837

3938
using Catch::Matchers::Message;

silkworm/db/snapshots/index_builder_test.cpp renamed to silkworm/db/snapshot_index_builder_test.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414
limitations under the License.
1515
*/
1616

17-
#include "index_builder.hpp"
18-
1917
#include <catch2/catch.hpp>
2018

21-
#include <silkworm/db/snapshots/body_index.hpp>
22-
#include <silkworm/db/snapshots/header_index.hpp>
23-
#include <silkworm/db/snapshots/test_util/common.hpp>
24-
#include <silkworm/db/snapshots/txn_index.hpp>
25-
#include <silkworm/db/snapshots/txn_to_block_index.hpp>
19+
#include <silkworm/db/bodies/body_index.hpp>
20+
#include <silkworm/db/headers/header_index.hpp>
21+
#include <silkworm/db/snapshots/index_builder.hpp>
22+
#include <silkworm/db/test_util/temp_snapshots.hpp>
23+
#include <silkworm/db/transactions/txn_index.hpp>
24+
#include <silkworm/db/transactions/txn_to_block_index.hpp>
2625
#include <silkworm/infra/common/decoding_exception.hpp>
2726
#include <silkworm/infra/common/directories.hpp>
2827
#include <silkworm/infra/test_util/log.hpp>

silkworm/db/snapshot_repository_test.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919

2020
#include <catch2/catch.hpp>
2121

22+
#include <silkworm/db/bodies/body_index.hpp>
23+
#include <silkworm/db/headers/header_index.hpp>
2224
#include <silkworm/db/snapshot_bundle_factory_impl.hpp>
23-
#include <silkworm/db/snapshots/body_index.hpp>
24-
#include <silkworm/db/snapshots/header_index.hpp>
2525
#include <silkworm/db/snapshots/index_builder.hpp>
2626
#include <silkworm/db/snapshots/repository.hpp>
27-
#include <silkworm/db/snapshots/test_util/common.hpp>
28-
#include <silkworm/db/snapshots/txn_index.hpp>
29-
#include <silkworm/db/snapshots/txn_queries.hpp>
30-
#include <silkworm/db/snapshots/txn_to_block_index.hpp>
27+
#include <silkworm/db/test_util/temp_snapshots.hpp>
28+
#include <silkworm/db/transactions/txn_index.hpp>
29+
#include <silkworm/db/transactions/txn_queries.hpp>
30+
#include <silkworm/db/transactions/txn_to_block_index.hpp>
3131
#include <silkworm/infra/common/directories.hpp>
3232
#include <silkworm/infra/common/log.hpp>
3333
#include <silkworm/infra/test_util/log.hpp>

silkworm/db/snapshot_sync.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#include <magic_enum.hpp>
2424

2525
#include <silkworm/core/types/hash.hpp>
26+
#include <silkworm/db/headers/header_snapshot.hpp>
2627
#include <silkworm/db/mdbx/etl_mdbx_collector.hpp>
2728
#include <silkworm/db/snapshots/config.hpp>
28-
#include <silkworm/db/snapshots/header_snapshot.hpp>
2929
#include <silkworm/db/snapshots/index_builder.hpp>
3030
#include <silkworm/db/snapshots/path.hpp>
3131
#include <silkworm/db/stages.hpp>

silkworm/db/snapshot_sync_test.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
#include <catch2/catch.hpp>
2020

2121
#include <silkworm/core/chain/config.hpp>
22+
#include <silkworm/db/bodies/body_index.hpp>
23+
#include <silkworm/db/headers/header_index.hpp>
2224
#include <silkworm/db/snapshot_bundle_factory_impl.hpp>
23-
#include <silkworm/db/snapshots/body_index.hpp>
24-
#include <silkworm/db/snapshots/header_index.hpp>
25-
#include <silkworm/db/snapshots/test_util/common.hpp>
26-
#include <silkworm/db/snapshots/txn_index.hpp>
27-
#include <silkworm/db/snapshots/txn_to_block_index.hpp>
2825
#include <silkworm/db/test_util/temp_chain_data.hpp>
26+
#include <silkworm/db/test_util/temp_snapshots.hpp>
27+
#include <silkworm/db/transactions/txn_index.hpp>
28+
#include <silkworm/db/transactions/txn_to_block_index.hpp>
2929
#include <silkworm/infra/common/log.hpp>
3030
#include <silkworm/infra/test_util/log.hpp>
3131
#include <silkworm/infra/test_util/temporary_file.hpp>

silkworm/db/snapshots/snapshot_test.cpp renamed to silkworm/db/snapshot_test.cpp

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,21 @@
1919

2020
#include <catch2/catch.hpp>
2121

22-
#include <silkworm/db/snapshots/body_index.hpp>
23-
#include <silkworm/db/snapshots/body_queries.hpp>
24-
#include <silkworm/db/snapshots/header_index.hpp>
25-
#include <silkworm/db/snapshots/header_queries.hpp>
22+
#include <silkworm/db/bodies/body_index.hpp>
23+
#include <silkworm/db/bodies/body_queries.hpp>
24+
#include <silkworm/db/headers/header_index.hpp>
25+
#include <silkworm/db/headers/header_queries.hpp>
2626
#include <silkworm/db/snapshots/index_builder.hpp>
27-
#include <silkworm/db/snapshots/test_util/common.hpp>
28-
#include <silkworm/db/snapshots/txn_index.hpp>
29-
#include <silkworm/db/snapshots/txn_queries.hpp>
30-
#include <silkworm/db/snapshots/txn_to_block_index.hpp>
27+
#include <silkworm/db/snapshots/snapshot_reader.hpp>
28+
#include <silkworm/db/test_util/temp_snapshots.hpp>
29+
#include <silkworm/db/transactions/txn_index.hpp>
30+
#include <silkworm/db/transactions/txn_queries.hpp>
31+
#include <silkworm/db/transactions/txn_snapshot_word_serializer.hpp>
32+
#include <silkworm/db/transactions/txn_to_block_index.hpp>
3133
#include <silkworm/infra/common/directories.hpp>
3234
#include <silkworm/infra/common/log.hpp>
3335
#include <silkworm/infra/test_util/log.hpp>
3436

35-
#include "snapshot_reader.hpp"
36-
#include "txn_snapshot_word_serializer.hpp"
37-
3837
namespace silkworm::snapshots {
3938

4039
namespace test = test_util;

silkworm/db/snapshots/txn_index.cpp renamed to silkworm/db/transactions/txn_index.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616

1717
#include "txn_index.hpp"
1818

19-
#include "body_txs_amount_query.hpp"
20-
#include "snapshot_reader.hpp"
19+
#include <silkworm/db/bodies/body_txs_amount_query.hpp>
20+
#include <silkworm/db/snapshots/snapshot_reader.hpp>
21+
2122
#include "txn_snapshot_word_serializer.hpp"
2223

2324
namespace silkworm::snapshots {

silkworm/db/snapshots/txn_index.hpp renamed to silkworm/db/transactions/txn_index.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@
2222

2323
#include <silkworm/core/common/bytes.hpp>
2424
#include <silkworm/db/etl/collector.hpp>
25+
#include <silkworm/db/snapshots/index_builder.hpp>
26+
#include <silkworm/db/snapshots/path.hpp>
2527
#include <silkworm/infra/common/memory_mapped_file.hpp>
2628

27-
#include "index_builder.hpp"
28-
#include "path.hpp"
29-
3029
namespace silkworm::snapshots {
3130

3231
struct TransactionKeyFactory : IndexKeyFactory {

silkworm/db/snapshots/txn_queries.hpp renamed to silkworm/db/transactions/txn_queries.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
#include <silkworm/core/common/bytes.hpp>
2222
#include <silkworm/core/types/hash.hpp>
23+
#include <silkworm/db/snapshots/basic_queries.hpp>
2324

24-
#include "basic_queries.hpp"
2525
#include "txn_snapshot.hpp"
2626

2727
namespace silkworm::snapshots {

silkworm/db/snapshots/txn_snapshot.hpp renamed to silkworm/db/transactions/txn_snapshot.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
#pragma once
1818

19-
#include "snapshot_reader.hpp"
19+
#include <silkworm/db/snapshots/snapshot_reader.hpp>
20+
2021
#include "txn_snapshot_word_serializer.hpp"
2122

2223
namespace silkworm::snapshots {

silkworm/db/snapshots/txn_snapshot_word_serializer.hpp renamed to silkworm/db/transactions/txn_snapshot_word_serializer.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
#include <silkworm/core/common/bytes.hpp>
2323
#include <silkworm/core/types/hash.hpp>
2424
#include <silkworm/core/types/transaction.hpp>
25-
26-
#include "snapshot_word_serializer.hpp"
25+
#include <silkworm/db/snapshots/snapshot_word_serializer.hpp>
2726

2827
namespace silkworm::snapshots {
2928

0 commit comments

Comments
 (0)