refactor: remove RemoteUploader

Author: sfauvel

mithril-aggregator/src/dependency_injection/builder.rs

@@ -79,8 +79,8 @@ use crate::{
     AggregatorConfig, AggregatorRunner, AggregatorRuntime, CompressedArchiveSnapshotter,
     Configuration, DependencyContainer, DumbSnapshotter, DumbUploader, EpochSettingsStorer,
     FileUploader, LocalUploader, MetricsService, MithrilSignerRegisterer, MultiSigner,
-    MultiSignerImpl, RemoteUploader, SingleSignatureAuthenticator, SnapshotUploaderType,
-    Snapshotter, SnapshotterCompressionAlgorithm, VerificationKeyStorer,
+    MultiSignerImpl, SingleSignatureAuthenticator, SnapshotUploaderType, Snapshotter,
+    SnapshotterCompressionAlgorithm, VerificationKeyStorer,
 };
 
 const SQLITE_FILE: &str = "aggregator.sqlite3";
@@ -462,13 +462,10 @@ impl DependenciesBuilder {
                             )
                         })?;
 
-                    Ok(Arc::new(RemoteUploader::new(
-                        Box::new(GcpUploader::new(
-                            bucket,
-                            self.configuration.snapshot_use_cdn_domain,
-                            logger.clone(),
-                        )),
-                        logger,
+                    Ok(Arc::new(GcpUploader::new(
+                        bucket,
+                        self.configuration.snapshot_use_cdn_domain,
+                        logger.clone(),
                     )))
                 }
                 SnapshotUploaderType::Local => Ok(Arc::new(LocalUploader::new(

mithril-aggregator/src/file_uploaders/mod.rs

@@ -2,14 +2,12 @@ mod dumb_uploader;
 mod gcp_uploader;
 mod interface;
 mod local_uploader;
-mod remote_uploader;
 
 pub use dumb_uploader::*;
 pub use gcp_uploader::GcpUploader;
 pub use interface::FileLocation;
 pub use interface::FileUploader;
 pub use local_uploader::LocalUploader;
-pub use remote_uploader::RemoteUploader;
 
 #[cfg(test)]
 pub use interface::MockFileUploader;

mithril-aggregator/src/file_uploaders/remote_uploader.rs

@@ -38,7 +38,7 @@ pub use crate::configuration::{
 pub use crate::multi_signer::{MultiSigner, MultiSignerImpl};
 pub use commands::{CommandType, MainOpts};
 pub use dependency_injection::DependencyContainer;
-pub use file_uploaders::{DumbUploader, FileUploader, LocalUploader, RemoteUploader};
+pub use file_uploaders::{DumbUploader, FileUploader, LocalUploader};
 pub use message_adapters::{FromRegisterSignerAdapter, ToCertificatePendingMessageAdapter};
 pub use metrics::*;
 pub use runtime::{