refactor: update DummyImmutablesDbBuilder to simplify its usage

Author: dlachaume

mithril-aggregator/src/artifact_builder/cardano_database.rs

@@ -113,20 +113,19 @@ mod tests {
     fn should_compute_the_size_of_the_uncompressed_database_only_immutable_ledger_and_volatile() {
         let test_dir = get_test_directory("should_compute_the_size_of_the_uncompressed_database_only_immutable_ledger_and_volatile");
 
-        let immutable_file_size = 777;
+        let immutable_trio_file_size = 777;
         let ledger_file_size = 6666;
         let volatile_file_size = 99;
         DummyImmutablesDbBuilder::new(test_dir.as_os_str().to_str().unwrap())
             .with_immutables(&[1, 2])
-            .set_immutable_file_size(immutable_file_size)
-            .with_ledger_files(vec!["blocks-0.dat".to_string()])
+            .set_immutable_trio_file_size(immutable_trio_file_size)
+            .with_ledger_files(&["blocks-0.dat", "blocks-1.dat", "blocks-2.dat"])
             .set_ledger_file_size(ledger_file_size)
-            .with_volatile_files(vec!["437".to_string(), "537".to_string()])
+            .with_volatile_files(&["437", "537", "637", "737"])
             .set_volatile_file_size(volatile_file_size)
             .build();
-        // Number of immutable files = 2 × 3 ('chunk', 'primary' and 'secondary').
         let expected_total_size =
-            (2 * 3 * immutable_file_size) + ledger_file_size + (2 * volatile_file_size);
+            (2 * immutable_trio_file_size) + (3 * ledger_file_size) + (4 * volatile_file_size);
 
         let total_size = compute_uncompressed_database_size(&test_dir).unwrap();
 
@@ -137,16 +136,18 @@ mod tests {
     async fn should_compute_valid_artifact() {
         let test_dir = get_test_directory("should_compute_valid_artifact");
 
+        let immutable_trio_file_size = 777;
+        let ledger_file_size = 6666;
+        let volatile_file_size = 99;
         DummyImmutablesDbBuilder::new(test_dir.as_os_str().to_str().unwrap())
             .with_immutables(&[1])
-            .set_immutable_file_size(100)
-            .with_ledger_files(vec!["blocks-0.dat".to_string()])
-            .set_ledger_file_size(100)
-            .with_volatile_files(vec!["437".to_string()])
-            .set_volatile_file_size(100)
+            .set_immutable_trio_file_size(immutable_trio_file_size)
+            .with_ledger_files(&["blocks-0.dat"])
+            .set_ledger_file_size(ledger_file_size)
+            .with_volatile_files(&["437"])
+            .set_volatile_file_size(volatile_file_size)
             .build();
-        // Number of immutable files = 1 × 3 ('chunk', 'primary' and 'secondary').
-        let expected_total_size = (3 * 100) + 100 + 100;
+        let expected_total_size = immutable_trio_file_size + ledger_file_size + volatile_file_size;
 
         let cardano_database_artifact_builder = CardanoDatabaseArtifactBuilder::new(
             test_dir,

mithril-common/src/digesters/cardano_immutable_digester.rs

@@ -617,7 +617,7 @@ mod tests {
         let immutable_db = db_builder("hash_computation_is_quicker_with_a_full_cache")
             .with_immutables(&(1..=50).collect::<Vec<ImmutableFileNumber>>())
             .append_immutable_trio()
-            .set_immutable_file_size(65536)
+            .set_immutable_trio_file_size(65538)
             .build();
         let cache = MemoryImmutableFileDigestCacheProvider::default();
         let logger = TestLogger::stdout();

mithril-common/src/digesters/dummy_immutable_db_builder.rs

@@ -77,8 +77,8 @@ impl DummyImmutablesDbBuilder {
     }
 
     /// Set ledger files to write to the db in the 'ledger' subdirectory.
-    pub fn with_ledger_files(&mut self, files: Vec<String>) -> &mut Self {
-        self.ledger_files_to_write = files;
+    pub fn with_ledger_files(&mut self, files: &[&str]) -> &mut Self {
+        self.ledger_files_to_write = files.iter().map(|name| name.to_string()).collect();
         self
     }
 
@@ -89,8 +89,8 @@ impl DummyImmutablesDbBuilder {
     }
 
     /// Set volatile files to write to the db in the 'volatile' subdirectory.
-    pub fn with_volatile_files(&mut self, files: Vec<String>) -> &mut Self {
-        self.volatile_files_to_write = files;
+    pub fn with_volatile_files(&mut self, files: &[&str]) -> &mut Self {
+        self.volatile_files_to_write = files.iter().map(|f| f.to_string()).collect();
         self
     }
 
@@ -111,8 +111,13 @@ impl DummyImmutablesDbBuilder {
     /// Set the size of all immutable files written by [build][Self::build] to the given `file_size` in bytes.
     ///
     /// Note: by default the size of the produced files is less than a 1kb.
-    pub fn set_immutable_file_size(&mut self, file_size: u64) -> &mut Self {
-        self.immutable_file_size = Some(file_size);
+    pub fn set_immutable_trio_file_size(&mut self, trio_file_size: u64) -> &mut Self {
+        assert!(
+            trio_file_size % 3 == 0,
+            "'trio_file_size' must be a multiple of 3"
+        );
+
+        self.immutable_file_size = Some(trio_file_size / 3);
         self
     }