SnapshotSync::seed_frozen_local_snapshots: don't use max_block_number…

…, remove compute_max_block

silkworm/db/datastore/snapshots/config.cpp

@@ -16,6 +16,7 @@
 
 #include "config.hpp"
 
+#include <ranges>
 #include <span>
 
 #include <silkworm/core/common/small_map.hpp>
@@ -58,25 +59,6 @@ Config Config::lookup_known_config(
     return Config{std::move(entries)};
 }
 
-Config::Config(PreverifiedList entries)
-    : entries_(std::move(entries)),
-      max_block_number_(compute_max_block(entries_)) {
-}
-
-BlockNum Config::compute_max_block(const PreverifiedList& entries) {
-    BlockNum max_block{0};
-    for (const auto& entry : entries) {
-        const auto snapshot_path = SnapshotPath::parse(std::filesystem::path{entry.file_name});
-        if (!snapshot_path) continue;
-        if (snapshot_path->extension() != kSegmentExtension) continue;
-        if (snapshot_path->type() != SnapshotType::headers) continue;
-        if (snapshot_path->block_range().end > max_block) {
-            max_block = snapshot_path->block_range().end;
-        }
-    }
-    return max_block > 0 ? max_block - 1 : 0;
-}
-
 PreverifiedList Config::remove_unsupported_entries(const PreverifiedList& entries) {
     static constexpr std::array kUnsupportedSnapshotNameTokens = {
         "/"sv,
@@ -89,7 +71,7 @@ PreverifiedList Config::remove_unsupported_entries(const PreverifiedList& entrie
 
     // erase file names containing any of the unsupported tokens
     std::erase_if(results, [&](const Entry& entry) {
-        return std::any_of(kUnsupportedSnapshotNameTokens.begin(), kUnsupportedSnapshotNameTokens.end(), [&entry](const auto& token) {
+        return std::ranges::any_of(kUnsupportedSnapshotNameTokens, [&entry](std::string_view token) {
             // NOLINTNEXTLINE(abseil-string-find-str-contains)
             return entry.file_name.find(token) != std::string_view::npos;
         });
@@ -98,4 +80,10 @@ PreverifiedList Config::remove_unsupported_entries(const PreverifiedList& entrie
     return results;
 }
 
+bool Config::contains_file_name(std::string_view file_name) const {
+    return std::ranges::any_of(entries_, [&](const Entry& entry) {
+        return entry.file_name == file_name;
+    });
+}
+
 }  // namespace silkworm::snapshots

silkworm/db/datastore/snapshots/config.hpp

@@ -35,17 +35,16 @@ class Config {
         ChainId chain_id,
         std::optional<std::function<bool(std::string_view file_name)>> include_filter_opt = std::nullopt);
 
-    explicit Config(PreverifiedList entries);
+    explicit Config(PreverifiedList entries)
+        : entries_(std::move(entries)) {}
 
-    [[nodiscard]] const PreverifiedList& preverified_snapshots() const { return entries_; }
-    [[nodiscard]] BlockNum max_block_number() const { return max_block_number_; }
+    const PreverifiedList& preverified_snapshots() const { return entries_; }
+    bool contains_file_name(std::string_view file_name) const;
 
   private:
-    static BlockNum compute_max_block(const PreverifiedList& entries);
     static PreverifiedList remove_unsupported_entries(const PreverifiedList& entries);
 
     PreverifiedList entries_;
-    BlockNum max_block_number_;
 };
 
 }  // namespace silkworm::snapshots

silkworm/db/datastore/snapshots/snapshot_path.hpp

@@ -22,8 +22,6 @@
 #include <string>
 #include <vector>
 
-#include <silkworm/core/common/base.hpp>
-
 #include "snapshot_type.hpp"
 #include "step.hpp"
 
@@ -51,10 +49,6 @@ class SnapshotPath {
     std::string extension() const { return path_.extension().string(); }
     uint8_t version() const { return version_; }
     StepRange step_range() const { return step_range_; }
-    // TODO: remove
-    BlockNumRange block_range() const {
-        return step_range().to_block_num_range();
-    }
     SnapshotType type() const { return type_; }
     std::string type_string() const;
     bool exists() const { return std::filesystem::exists(path_); }

silkworm/db/snapshot_sync.cpp

@@ -275,7 +275,9 @@ void SnapshotSync::seed_frozen_local_snapshots() {
     for (auto& bundle_ptr : repository_.view_bundles()) {
         auto& bundle = *bundle_ptr;
         bool is_frozen = bundle.block_range().size() >= kMaxMergerSnapshotSize;
-        bool is_preverified = bundle.block_range().end <= snapshots_config_.max_block_number() + 1;
+        const auto first_snapshot = bundle.snapshots()[0];
+        // assume that if one snapshot in the bundle is preverified, then all of them are
+        bool is_preverified = snapshots_config_.contains_file_name(first_snapshot.get().path().filename());
         if (is_frozen && !is_preverified) {
             seed_bundle(bundle);
         }