Merge pull request #1236 from input-output-hk/damien/798/implement-anyhow-context-for-aggregator-configuration

Implement anyhow context for aggregator configuration

Author: dlachaume

Cargo.lock

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

mithril-aggregator/Cargo.toml

@@ -1,19 +1,16 @@
+use anyhow::anyhow;
 use config::{ConfigError, Map, Source, Value, ValueKind};
 use mithril_common::crypto_helper::ProtocolGenesisSigner;
 use mithril_common::era::adapters::EraReaderAdapterType;
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 use std::str::FromStr;
-use std::sync::Arc;
 
 use mithril_common::entities::{
     CompressionAlgorithm, HexEncodedGenesisVerificationKey, ProtocolParameters,
 };
 use mithril_common::{CardanoNetwork, StdResult};
 
-use crate::tools::GcpFileUploader;
-use crate::{LocalSnapshotUploader, RemoteSnapshotUploader, SnapshotUploader};
-
 /// Different kinds of execution environments
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
 pub enum ExecutionEnvironment {
@@ -199,30 +196,10 @@ impl Configuration {
         format!("http://{}:{}/", self.server_ip, self.server_port)
     }
 
-    /// Create a snapshot uploader from configuration settings.
-    pub fn build_snapshot_uploader(&self) -> StdResult<Arc<dyn SnapshotUploader>> {
-        match self.snapshot_uploader_type {
-            SnapshotUploaderType::Gcp => {
-                let bucket = self.snapshot_bucket_name.to_owned().ok_or_else(|| {
-                    ConfigError::Message("missing snapshot bucket name".to_string())
-                })?;
-                Ok(Arc::new(RemoteSnapshotUploader::new(
-                    Box::new(GcpFileUploader::new(bucket.clone())),
-                    bucket,
-                    self.snapshot_use_cdn_domain,
-                )))
-            }
-            SnapshotUploaderType::Local => Ok(Arc::new(LocalSnapshotUploader::new(
-                self.get_server_url(),
-                &self.snapshot_directory,
-            ))),
-        }
-    }
-
     /// Check configuration and return a representation of the Cardano network.
-    pub fn get_network(&self) -> Result<CardanoNetwork, ConfigError> {
+    pub fn get_network(&self) -> StdResult<CardanoNetwork> {
         CardanoNetwork::from_code(self.network.clone(), self.network_magic)
-            .map_err(|e| ConfigError::Message(e.to_string()))
+            .map_err(|e| anyhow!(ConfigError::Message(e.to_string())))
     }
 
     /// Return the file of the SQLite stores. If the directory does not exist, it is created.

mithril-aggregator/src/configuration.rs

@@ -469,7 +469,9 @@ impl DependenciesBuilder {
         let cli_runner = CardanoCliRunner::new(
             self.configuration.cardano_cli_path.clone(),
             self.configuration.cardano_node_socket_path.clone(),
-            self.configuration.get_network()?,
+            self.configuration.get_network().with_context(|| {
+                "Dependencies Builder can not get Cardano network while building cardano cli runner"
+            })?,
         );
 
         Ok(Box::new(cli_runner))
@@ -488,7 +490,9 @@ impl DependenciesBuilder {
         let beacon_provider = BeaconProviderImpl::new(
             self.get_chain_observer().await?,
             self.get_immutable_file_observer().await?,
-            self.configuration.get_network()?,
+            self.configuration.get_network().with_context(|| {
+                "Dependencies Builder can not get Cardano network while building beacon provider"
+            })?,
         );
 
         Ok(Arc::new(beacon_provider))
@@ -1045,7 +1049,9 @@ impl DependenciesBuilder {
 
         let config = AggregatorConfig::new(
             self.configuration.run_interval,
-            self.configuration.get_network()?,
+            self.configuration.get_network().with_context(|| {
+                "Dependencies Builder can not get Cardano network while creating aggregator runner"
+            })?,
             &self.configuration.db_directory.clone(),
         );
         let runtime = AggregatorRuntime::new(
@@ -1087,7 +1093,9 @@ impl DependenciesBuilder {
 
     /// Create [TickerService] instance.
     pub async fn build_ticker_service(&mut self) -> Result<Arc<dyn TickerService>> {
-        let network = self.configuration.get_network()?;
+        let network = self.configuration.get_network().with_context(|| {
+            "Dependencies Builder can not get Cardano network while building ticker service"
+        })?;
         let chain_observer = self.get_chain_observer().await?;
         let immutable_observer = self.get_immutable_file_observer().await?;