refactor: support in memory ledger state in DummyCardanoDbBuilder

Alenar · Alenar · commit 45c44b7fdac2 · 2025-05-27T12:00:50.000+02:00
by adding a path for all ledger state snapshot variant (+ the 'non' file)
+ add unit tests to the builder
diff --git a/mithril-aggregator/src/artifact_builder/cardano_database.rs b/mithril-aggregator/src/artifact_builder/cardano_database.rs
@@ -169,7 +169,7 @@ mod tests {
             .with_immutables(&[0, 1, 2, 3])
             .append_immutable_trio()
             .set_immutable_trio_file_size(immutable_trio_file_size)
-            .with_ledger_files(&["437"])
+            .with_legacy_ledger_snapshots(&[437])
             .set_ledger_file_size(ledger_file_size)
             .with_volatile_files(&["blocks-0.dat"])
             .set_volatile_file_size(volatile_file_size)
diff --git a/mithril-aggregator/src/services/snapshotter/compressed_archive_snapshotter.rs b/mithril-aggregator/src/services/snapshotter/compressed_archive_snapshotter.rs
@@ -449,7 +449,7 @@ mod tests {
             let cardano_db = DummyCardanoDbBuilder::new(current_function!())
                 .with_immutables(&[1, 2, 3])
                 .append_immutable_trio()
-                .with_ledger_files(&["437"])
+                .with_legacy_ledger_snapshots(&[437])
                 .with_volatile_files(&["blocks-0.dat"])
                 .with_non_immutables(&["random_file.txt", "00002.trap"])
                 .build();
@@ -492,7 +492,7 @@ mod tests {
             let test_dir = temp_dir_create!();
             let cardano_db = DummyCardanoDbBuilder::new(current_function!())
                 .with_immutables(&[1, 2, 3])
-                .with_ledger_files(&["437"])
+                .with_legacy_ledger_snapshots(&[437])
                 .with_volatile_files(&["blocks-0.dat"])
                 .with_non_immutables(&["random_file.txt", "00002.trap"])
                 .build();
@@ -532,7 +532,7 @@ mod tests {
             let test_dir = temp_dir_create!();
             let cardano_db = DummyCardanoDbBuilder::new(current_function!())
                 .with_immutables(&[1, 2])
-                .with_ledger_files(&["737"])
+                .with_legacy_ledger_snapshots(&[737])
                 .build();
             let snapshotter =
                 snapshotter_for_test(&test_dir, cardano_db.get_dir(), CompressionAlgorithm::Gzip);
@@ -579,7 +579,7 @@ mod tests {
             let test_dir = temp_dir_create!();
             let cardano_db = DummyCardanoDbBuilder::new(current_function!())
                 .with_immutables(&[1, 2])
-                .with_ledger_files(&["637"])
+                .with_legacy_ledger_snapshots(&[637])
                 .build();
             let snapshotter = CompressedArchiveSnapshotter {
                 ancillary_signer: Arc::new(MockAncillarySigner::that_succeeds_with_signature(
@@ -607,7 +607,7 @@ mod tests {
             let test_dir = temp_dir_create!();
             let cardano_db = DummyCardanoDbBuilder::new(current_function!())
                 .with_immutables(&[1, 2])
-                .with_ledger_files(&["637"])
+                .with_legacy_ledger_snapshots(&[637])
                 .build();
             let snapshotter = CompressedArchiveSnapshotter {
                 ancillary_signer: Arc::new(MockAncillarySigner::that_fails_with_message("failure")),
@@ -633,7 +633,8 @@ mod tests {
             let test_dir = temp_dir_create!();
             let cardano_db = DummyCardanoDbBuilder::new(current_function!())
                 .with_immutables(&[1, 2, 3])
-                .with_ledger_files(&["437", "537", "637", "737", "9not_included"])
+                .with_legacy_ledger_snapshots(&[437, 537, 637, 737])
+                .with_non_ledger_files(&["9not_included"])
                 .with_volatile_files(&["blocks-0.dat", "blocks-1.dat", "blocks-2.dat"])
                 .build();
             fs::create_dir(cardano_db.get_dir().join("whatever")).unwrap();
@@ -673,7 +674,7 @@ mod tests {
             let test_dir = temp_dir_create!();
             let cardano_db = DummyCardanoDbBuilder::new(current_function!())
                 .with_immutables(&[1, 2])
-                .with_ledger_files(&["737"])
+                .with_legacy_ledger_snapshots(&[737])
                 .build();
 
             let snapshotter = CompressedArchiveSnapshotter {
@@ -698,7 +699,7 @@ mod tests {
             let test_dir = temp_dir_create!();
             let cardano_db = DummyCardanoDbBuilder::new(current_function!())
                 .with_immutables(&[1, 2, 3])
-                .with_ledger_files(&["537", "637", "737"])
+                .with_legacy_ledger_snapshots(&[537, 637, 737])
                 .with_non_immutables(&["not_to_include.txt"])
                 .build();
             File::create(cardano_db.get_dir().join("not_to_include_as_well.txt")).unwrap();
@@ -758,7 +759,7 @@ mod tests {
             let cardano_db = DummyCardanoDbBuilder::new(current_function!())
                 .with_immutables(&[1, 2, 3])
                 .set_immutable_trio_file_size(immutable_trio_file_size)
-                .with_ledger_files(&["737"])
+                .with_legacy_ledger_snapshots(&[737])
                 .set_ledger_file_size(6666)
                 .with_volatile_files(&["blocks-0.dat"])
                 .set_volatile_file_size(99)
diff --git a/mithril-aggregator/src/tools/file_archiver/appender.rs b/mithril-aggregator/src/tools/file_archiver/appender.rs
@@ -390,7 +390,7 @@ mod tests {
             let cardano_db = DummyCardanoDbBuilder::new(test_dir)
                 .with_immutables(&[1, 2, 3])
                 .set_immutable_trio_file_size(immutable_trio_file_size)
-                .with_ledger_files(&["437", "537", "637", "737"])
+                .with_legacy_ledger_snapshots(&[437, 537, 637, 737])
                 .set_ledger_file_size(ledger_file_size)
                 .with_volatile_files(&["blocks-0.dat", "blocks-1.dat", "blocks-2.dat"])
                 .set_volatile_file_size(volatile_file_size)
@@ -480,7 +480,7 @@ mod tests {
             let cardano_db = DummyCardanoDbBuilder::new(test_dir)
                 .with_immutables(&[1, 2])
                 .set_immutable_trio_file_size(immutable_trio_file_size)
-                .with_ledger_files(&["437", "537", "637"])
+                .with_legacy_ledger_snapshots(&[437, 537, 637])
                 .set_ledger_file_size(ledger_file_size)
                 .with_volatile_files(&["blocks-0.dat"])
                 .set_volatile_file_size(volatile_file_size)
diff --git a/mithril-client/tests/cardano_db_snapshot_list_get_download_verify.rs b/mithril-client/tests/cardano_db_snapshot_list_get_download_verify.rs
@@ -29,7 +29,7 @@ async fn cardano_db_snapshot_list_get_download_verify() {
     let cardano_db = DummyCardanoDbBuilder::new("cardano_db_snapshot_list_get_download_verify_db")
         .with_immutables(&[1, 2, 3, 4])
         .append_immutable_trio()
-        .with_ledger_files(&["437", "537", "637"])
+        .with_legacy_ledger_snapshots(&[437, 537, 637])
         .with_volatile_files(&["blocks-0.dat", "blocks-1.dat"])
         .build();
     let digester =
diff --git a/mithril-client/tests/extensions/snapshot_archives.rs b/mithril-client/tests/extensions/snapshot_archives.rs
@@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};
 
 use mithril_common::crypto_helper::{ManifestSigner, ManifestVerifierSecretKey};
 use mithril_common::digesters::{
-    immutable_trio_names, ComputedImmutablesDigests, DummyCardanoDb, IMMUTABLE_DIR,
+    immutable_trio_names, ComputedImmutablesDigests, DummyCardanoDb, IMMUTABLE_DIR, LEDGER_DIR,
 };
 use mithril_common::entities::{AncillaryFilesManifest, CompressionAlgorithm, ImmutableFileNumber};
 use mithril_common::messages::CardanoDatabaseDigestListItemMessage;
@@ -107,8 +107,8 @@ pub async fn build_ancillary_files_archive(
 ) {
     let db_dir = cardano_db.get_dir();
     let ancillary_immutable_number = cardano_db.last_immutable_number().unwrap() + 1;
-    let last_ledger_file_path = cardano_db
-        .get_ledger_files()
+    let last_ledger_state_snapshot = cardano_db
+        .get_ledger_state_snapshots()
         .last()
         .expect("Given db should have at least one ledger file");
     let archive_name = format!(
@@ -120,15 +120,18 @@ pub async fn build_ancillary_files_archive(
     let enc = zstd::Encoder::new(tar_file, 3).unwrap();
     let mut tar = tar::Builder::new(enc);
 
-    let files_to_include = vec![
-        PathBuf::from(format!(
-            "ledger/{}",
-            last_ledger_file_path.file_name().unwrap().to_string_lossy()
-        )),
+    let mut files_to_include = vec![
         PathBuf::from(IMMUTABLE_DIR).join(format!("{ancillary_immutable_number:05}.chunk")),
         PathBuf::from(IMMUTABLE_DIR).join(format!("{ancillary_immutable_number:05}.primary")),
         PathBuf::from(IMMUTABLE_DIR).join(format!("{ancillary_immutable_number:05}.secondary")),
     ];
+    files_to_include.extend(
+        last_ledger_state_snapshot
+            .get_files_relative_path()
+            .into_iter()
+            .map(|p| PathBuf::from(LEDGER_DIR).join(p)),
+    );
+
     let ancillary_manifest = build_ancillary_manifest(
         db_dir,
         files_to_include.clone(),
diff --git a/mithril-client/tests/snapshot_list_get_show_download_verify.rs b/mithril-client/tests/snapshot_list_get_show_download_verify.rs
@@ -22,7 +22,7 @@ async fn snapshot_list_get_show_download_verify() {
     let cardano_db = DummyCardanoDbBuilder::new("snapshot_list_get_show_download_verify_db")
         .with_immutables(&[1, 2, 3])
         .append_immutable_trio()
-        .with_ledger_files(&["506", "562"])
+        .with_legacy_ledger_snapshots(&[506, 562])
         .build();
     let fake_aggregator = FakeAggregator::new();
     let test_http_server = fake_aggregator
diff --git a/mithril-common/src/digesters/dummy_cardano_db.rs b/mithril-common/src/digesters/dummy_cardano_db.rs
diff --git a/mithril-test-lab/mithril-end-to-end/src/bin/load-aggregator/main.rs b/mithril-test-lab/mithril-end-to-end/src/bin/load-aggregator/main.rs
