Merge pull request #2245 from input-output-hk/ensemble/move_split_snapshotter

split snapshotter

Author: dlachaume

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.6.19"
+version = "0.6.20"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-aggregator/Cargo.toml

@@ -137,9 +137,9 @@ mod tests {
     use crate::{
         artifact_builder::{MockAncillaryFileUploader, MockImmutableFilesUploader},
         immutable_file_digest_mapper::MockImmutableFileDigestMapper,
+        services::DumbSnapshotter,
         test_tools::TestLogger,
         tools::url_sanitizer::SanitizedUrlWithTrailingSlash,
-        DumbSnapshotter,
     };
 
     use super::*;

mithril-aggregator/src/artifact_builder/cardano_database.rs

@@ -16,8 +16,8 @@ use mithril_common::{
 
 use crate::{
     file_uploaders::{GcpUploader, LocalUploader},
-    snapshotter::OngoingSnapshot,
-    DumbUploader, FileUploader, Snapshotter,
+    services::{OngoingSnapshot, Snapshotter},
+    DumbUploader, FileUploader,
 };
 
 /// The [AncillaryFileUploader] trait allows identifying uploaders that return locations for ancillary archive files.
@@ -211,10 +211,10 @@ mod tests {
     };
     use uuid::Uuid;
 
-    use crate::{
-        test_tools::TestLogger, CompressedArchiveSnapshotter, DumbSnapshotter,
-        SnapshotterCompressionAlgorithm,
+    use crate::services::{
+        CompressedArchiveSnapshotter, DumbSnapshotter, SnapshotterCompressionAlgorithm,
     };
+    use crate::test_tools::TestLogger;
 
     use super::*;
 

mithril-aggregator/src/artifact_builder/cardano_database_artifacts/ancillary.rs

@@ -17,7 +17,8 @@ use mithril_common::{
 
 use crate::{
     file_uploaders::{GcpUploader, LocalUploader},
-    DumbUploader, FileUploader, Snapshotter,
+    services::Snapshotter,
+    DumbUploader, FileUploader,
 };
 
 fn immmutable_file_number_extractor(file_uri: &str) -> StdResult<Option<String>> {
@@ -224,11 +225,11 @@ mod tests {
     use mockall::predicate::{always, eq};
     use uuid::Uuid;
 
-    use crate::{
-        snapshotter::{MockSnapshotter, OngoingSnapshot},
-        test_tools::TestLogger,
-        CompressedArchiveSnapshotter, DumbSnapshotter, SnapshotterCompressionAlgorithm,
+    use crate::services::{
+        CompressedArchiveSnapshotter, DumbSnapshotter, MockSnapshotter, OngoingSnapshot,
+        SnapshotterCompressionAlgorithm,
     };
+    use crate::test_tools::TestLogger;
 
     use super::*;
 
@@ -767,8 +768,7 @@ mod tests {
 
             let url_prefix =
                 SanitizedUrlWithTrailingSlash::parse("http://test.com:8080/base-root").unwrap();
-            let uploader =
-                LocalUploader::new(url_prefix, &target_dir, TestLogger::stdout()).unwrap();
+            let uploader = LocalUploader::new(url_prefix, &target_dir, TestLogger::stdout());
             let location = ImmutableFilesUploader::batch_upload(
                 &uploader,
                 &[archive_1.clone(), archive_2.clone()],
@@ -802,8 +802,7 @@ mod tests {
 
             let url_prefix =
                 SanitizedUrlWithTrailingSlash::parse("http://test.com:8080/base-root").unwrap();
-            let uploader =
-                LocalUploader::new(url_prefix, &target_dir, TestLogger::stdout()).unwrap();
+            let uploader = LocalUploader::new(url_prefix, &target_dir, TestLogger::stdout());
 
             ImmutableFilesUploader::batch_upload(&uploader, &[archive])
                 .await

mithril-aggregator/src/artifact_builder/cardano_database_artifacts/immutable.rs

@@ -7,7 +7,10 @@ use std::path::Path;
 use std::sync::Arc;
 use thiserror::Error;
 
-use crate::{snapshotter::OngoingSnapshot, FileUploader, Snapshotter};
+use crate::{
+    services::{OngoingSnapshot, Snapshotter},
+    FileUploader,
+};
 
 use super::ArtifactBuilder;
 use mithril_common::logging::LoggerExtensions;
@@ -178,7 +181,8 @@ mod tests {
     use mithril_common::{entities::CompressionAlgorithm, test_utils::fake_data};
 
     use crate::{
-        file_uploaders::MockFileUploader, test_tools::TestLogger, DumbSnapshotter, DumbUploader,
+        file_uploaders::MockFileUploader, services::DumbSnapshotter, test_tools::TestLogger,
+        DumbUploader,
     };
 
     use super::*;

mithril-aggregator/src/artifact_builder/cardano_immutable_files_full.rs

@@ -75,19 +75,19 @@ use crate::{
     },
     services::{
         AggregatorSignableSeedBuilder, AggregatorUpkeepService, BufferedCertifierService,
-        CardanoTransactionsImporter, CertifierService, EpochServiceDependencies, MessageService,
-        MithrilCertifierService, MithrilEpochService, MithrilMessageService, MithrilProverService,
+        CardanoTransactionsImporter, CertifierService, CompressedArchiveSnapshotter,
+        DumbSnapshotter, EpochServiceDependencies, MessageService, MithrilCertifierService,
+        MithrilEpochService, MithrilMessageService, MithrilProverService,
         MithrilSignedEntityService, MithrilStakeDistributionService, ProverService,
-        SignedEntityService, SignedEntityServiceArtifactsDependencies, StakeDistributionService,
-        UpkeepService, UsageReporter,
+        SignedEntityService, SignedEntityServiceArtifactsDependencies, Snapshotter,
+        SnapshotterCompressionAlgorithm, StakeDistributionService, UpkeepService, UsageReporter,
     },
     store::CertificatePendingStorer,
     tools::{CExplorerSignerRetriever, GenesisToolsDependency, SignersImporter},
-    AggregatorConfig, AggregatorRunner, AggregatorRuntime, CompressedArchiveSnapshotter,
-    Configuration, DependencyContainer, DumbSnapshotter, DumbUploader, EpochSettingsStorer,
-    ImmutableFileDigestMapper, LocalSnapshotUploader, MetricsService, MithrilSignerRegisterer,
-    MultiSigner, MultiSignerImpl, SingleSignatureAuthenticator, SnapshotUploaderType, Snapshotter,
-    SnapshotterCompressionAlgorithm, VerificationKeyStorer,
+    AggregatorConfig, AggregatorRunner, AggregatorRuntime, Configuration, DependencyContainer,
+    DumbUploader, EpochSettingsStorer, ImmutableFileDigestMapper, LocalSnapshotUploader,
+    MetricsService, MithrilSignerRegisterer, MultiSigner, MultiSignerImpl,
+    SingleSignatureAuthenticator, SnapshotUploaderType, VerificationKeyStorer,
 };
 
 const SQLITE_FILE: &str = "aggregator.sqlite3";
@@ -490,7 +490,7 @@ impl DependenciesBuilder {
                         self.configuration.get_server_url()?,
                         &snapshot_artifacts_dir,
                         logger,
-                    )?))
+                    )))
                 }
             }
         } else {
@@ -1283,7 +1283,7 @@ impl DependenciesBuilder {
                         ancillary_url_prefix,
                         &target_dir,
                         logger,
-                    )?)])
+                    ))])
                 }
             }
         } else {
@@ -1321,7 +1321,7 @@ impl DependenciesBuilder {
                         immutable_url_prefix,
                         &target_dir,
                         logger,
-                    )?)])
+                    ))])
                 }
             }
         } else {
@@ -1364,7 +1364,7 @@ impl DependenciesBuilder {
                         digests_url_prefix,
                         &target_dir,
                         logger,
-                    )?)])
+                    ))])
                 }
             }
         } else {

mithril-aggregator/src/dependency_injection/builder.rs

@@ -36,12 +36,12 @@ use crate::{
     multi_signer::MultiSigner,
     services::{
         CertifierService, EpochService, MessageService, ProverService, SignedEntityService,
-        StakeDistributionService, TransactionStore, UpkeepService,
+        Snapshotter, StakeDistributionService, TransactionStore, UpkeepService,
     },
     signer_registerer::SignerRecorder,
     store::CertificatePendingStorer,
     EpochSettingsStorer, MetricsService, SignerRegisterer, SignerRegistrationRoundOpener,
-    SingleSignatureAuthenticator, Snapshotter, VerificationKeyStorer,
+    SingleSignatureAuthenticator, VerificationKeyStorer,
 };
 
 /// EpochServiceWrapper wraps a [EpochService]

mithril-aggregator/src/dependency_injection/containers.rs

@@ -28,15 +28,15 @@ impl LocalSnapshotUploader {
         server_url_prefix: SanitizedUrlWithTrailingSlash,
         target_location: &Path,
         logger: Logger,
-    ) -> StdResult<Self> {
+    ) -> Self {
         let logger = logger.new_with_component_name::<Self>();
         debug!(logger, "New LocalSnapshotUploader created"; "server_url_prefix" => &server_url_prefix.as_str());
 
-        Ok(Self {
+        Self {
             server_url_prefix,
             target_location: target_location.to_path_buf(),
             logger,
-        })
+        }
     }
 }
 
@@ -100,8 +100,7 @@ mod tests {
         let url_prefix =
             SanitizedUrlWithTrailingSlash::parse("http://test.com:8080/base-root").unwrap();
         let uploader =
-            LocalSnapshotUploader::new(url_prefix, target_dir.path(), TestLogger::stdout())
-                .unwrap();
+            LocalSnapshotUploader::new(url_prefix, target_dir.path(), TestLogger::stdout());
         let location = uploader
             .upload(&archive)
             .await
@@ -120,8 +119,7 @@ mod tests {
             SanitizedUrlWithTrailingSlash::parse("http://test.com:8080/base-root/").unwrap(),
             target_dir.path(),
             TestLogger::stdout(),
-        )
-        .unwrap();
+        );
         uploader.upload(&archive).await.unwrap();
 
         assert!(target_dir
@@ -140,8 +138,7 @@ mod tests {
             SanitizedUrlWithTrailingSlash::parse("http://test.com:8080/base-root/").unwrap(),
             target_dir.path(),
             TestLogger::stdout(),
-        )
-        .unwrap();
+        );
         uploader
             .upload(source_dir.path())
             .await

mithril-aggregator/src/file_uploaders/local_snapshot_uploader.rs

@@ -26,15 +26,15 @@ impl LocalUploader {
         server_url_prefix: SanitizedUrlWithTrailingSlash,
         target_location: &Path,
         logger: Logger,
-    ) -> StdResult<Self> {
+    ) -> Self {
         let logger = logger.new_with_component_name::<Self>();
         debug!(logger, "New LocalUploader created"; "server_url_prefix" => &server_url_prefix.as_str());
 
-        Ok(Self {
+        Self {
             server_url_prefix,
             target_location: target_location.to_path_buf(),
             logger,
-        })
+        }
     }
 }
 
@@ -101,7 +101,7 @@ mod tests {
 
         let url_prefix =
             SanitizedUrlWithTrailingSlash::parse("http://test.com:8080/base-root").unwrap();
-        let uploader = LocalUploader::new(url_prefix, &target_dir, TestLogger::stdout()).unwrap();
+        let uploader = LocalUploader::new(url_prefix, &target_dir, TestLogger::stdout());
         let location = FileUploader::upload(&uploader, &archive)
             .await
             .expect("local upload should not fail");
@@ -125,8 +125,7 @@ mod tests {
             SanitizedUrlWithTrailingSlash::parse("http://test.com:8080/base-root/").unwrap(),
             &target_dir,
             TestLogger::stdout(),
-        )
-        .unwrap();
+        );
         FileUploader::upload(&uploader, &archive).await.unwrap();
 
         assert!(target_dir.join(archive.file_name().unwrap()).exists());
@@ -146,8 +145,7 @@ mod tests {
             SanitizedUrlWithTrailingSlash::parse("http://test.com:8080/base-root/").unwrap(),
             &target_dir,
             TestLogger::stdout(),
-        )
-        .unwrap();
+        );
         FileUploader::upload(&uploader, &source_dir)
             .await
             .expect_err("Uploading a directory should fail");

mithril-aggregator/src/file_uploaders/local_uploader.rs

@@ -27,7 +27,6 @@ mod multi_signer;
 mod runtime;
 pub mod services;
 mod signer_registerer;
-mod snapshotter;
 mod store;
 mod tools;
 
@@ -49,10 +48,6 @@ pub use signer_registerer::{
     MithrilSignerRegisterer, SignerRecorder, SignerRegisterer, SignerRegistrationError,
     SignerRegistrationRound, SignerRegistrationRoundOpener,
 };
-pub use snapshotter::{
-    CompressedArchiveSnapshotter, DumbSnapshotter, SnapshotError, Snapshotter,
-    SnapshotterCompressionAlgorithm,
-};
 pub use store::{CertificatePendingStorer, EpochSettingsStorer, VerificationKeyStorer};
 pub use tools::{
     CExplorerSignerRetriever, SignersImporter, SignersImporterPersister, SignersImporterRetriever,

mithril-aggregator/src/lib.rs

@@ -16,6 +16,7 @@ mod message;
 mod prover;
 mod signable_builder;
 mod signed_entity;
+mod snapshotter;
 mod stake_distribution;
 mod upkeep;
 mod usage_reporter;
@@ -27,6 +28,7 @@ pub use message::*;
 pub use prover::*;
 pub use signable_builder::*;
 pub use signed_entity::*;
+pub use snapshotter::*;
 pub use stake_distribution::*;
 pub use upkeep::*;
 pub use usage_reporter::*;