Merge pull request #1232 from input-output-hk/damien/798/implement-anyhow-for-artifact-builder

Implement anyhow context for artifact builder

Author: dlachaume

Cargo.lock

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

mithril-aggregator/Cargo.toml

@@ -1,3 +1,4 @@
+use anyhow::Context;
 use async_trait::async_trait;
 use semver::Version;
 use slog_scope::{debug, warn};
@@ -23,8 +24,8 @@ use mithril_common::{
 #[derive(Debug, Error)]
 pub enum CardanoImmutableFilesFullArtifactError {
     /// Protocol message part is missing
-    #[error("Missing protocol message: '{0}'.")]
-    MissingProtocolMessage(String),
+    #[error("Missing protocol message for beacon: '{0}'.")]
+    MissingProtocolMessage(Beacon),
 }
 
 /// A [CardanoImmutableFilesFullArtifact] builder
@@ -62,9 +63,7 @@ impl CardanoImmutableFilesFullArtifactBuilder {
         let snapshot_digest = protocol_message
             .get_message_part(&ProtocolMessagePartKey::SnapshotDigest)
             .ok_or_else(|| {
-                CardanoImmutableFilesFullArtifactError::MissingProtocolMessage(format!(
-                    "no digest message part found for beacon '{beacon:?}'."
-                ))
+                CardanoImmutableFilesFullArtifactError::MissingProtocolMessage(beacon.clone())
             })?;
         let snapshot_name = format!(
             "{}-e{}-i{}.{}.{}",
@@ -117,10 +116,9 @@ impl CardanoImmutableFilesFullArtifactBuilder {
             .protocol_message
             .get_message_part(&ProtocolMessagePartKey::SnapshotDigest)
             .ok_or_else(|| {
-                CardanoImmutableFilesFullArtifactError::MissingProtocolMessage(format!(
-                    "message part 'digest' not found for snapshot '{}'.",
-                    ongoing_snapshot.get_file_path().display()
-                ))
+                CardanoImmutableFilesFullArtifactError::MissingProtocolMessage(
+                    certificate.beacon.clone(),
+                )
             })?
             .to_owned();
         let snapshot = Snapshot::new(
@@ -145,8 +143,16 @@ impl ArtifactBuilder<Beacon, Snapshot> for CardanoImmutableFilesFullArtifactBuil
     ) -> StdResult<Snapshot> {
         let ongoing_snapshot = self
             .create_snapshot_archive(&beacon, &certificate.protocol_message)
-            .await?;
-        let locations = self.upload_snapshot_archive(&ongoing_snapshot).await?;
+            .await
+            .with_context(|| {
+                "Cardano Immutable Files Full Artifact Builder can not create snapshot archive"
+            })?;
+        let locations = self
+            .upload_snapshot_archive(&ongoing_snapshot)
+            .await
+            .with_context(|| {
+                format!("Cardano Immutable Files Full Artifact Builder can not upload snapshot archive to path: '{:?}'", ongoing_snapshot.get_file_path())
+            })?;
 
         let snapshot = self
             .create_snapshot(certificate, &ongoing_snapshot, locations)

mithril-aggregator/src/artifact_builder/cardano_immutable_files_full.rs

@@ -13,12 +13,11 @@ use mithril_common::{
 /// Error linked to [MithrilStakeDistributionArtifactBuilder].
 #[derive(Debug, Error)]
 pub enum MithrilStakeDistributionArtifactBuilderError {
-    /// Could not get protocol parameters
-    #[error(
-        "Could not build Mithril Stake Distribution artifact, no protocol parameters available."
-    )]
-    NoProtocolParameters(),
+    /// Protocol parameters are missing
+    #[error("Missing protocol parameter for epoch: '{0}'.")]
+    MissingProtocolParameters(Epoch),
 }
+
 /// A [MithrilStakeDistributionArtifact] builder
 pub struct MithrilStakeDistributionArtifactBuilder {
     multi_signer: Arc<RwLock<dyn MultiSigner>>,
@@ -35,16 +34,15 @@ impl MithrilStakeDistributionArtifactBuilder {
 impl ArtifactBuilder<Epoch, MithrilStakeDistribution> for MithrilStakeDistributionArtifactBuilder {
     async fn compute_artifact(
         &self,
-        beacon: Epoch,
+        epoch: Epoch,
         _certificate: &Certificate,
     ) -> StdResult<MithrilStakeDistribution> {
         let multi_signer = self.multi_signer.read().await;
-        let protocol_parameters = multi_signer
-            .get_next_protocol_parameters()
-            .await?
-            .ok_or_else(MithrilStakeDistributionArtifactBuilderError::NoProtocolParameters)?;
+        let protocol_parameters = multi_signer.get_next_protocol_parameters().await?.ok_or(
+            MithrilStakeDistributionArtifactBuilderError::MissingProtocolParameters(epoch),
+        )?;
         Ok(MithrilStakeDistribution::new(
-            beacon,
+            epoch,
             multi_signer.get_next_signers_with_stake().await?,
             &protocol_parameters.into(),
         ))