Merge pull request #2858 from input-output-hk/djo/2825/enhance-error-contexts

chore: enhance and align usage of the anyhow across crates

Author: Alenar

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "client-cardano-database-v2"
 description = "Mithril client Cardano database example"
-version = "0.0.15"
+version = "0.0.16"
 authors = ["[email protected]", "[email protected]"]
 documentation = "https://mithril.network/doc"
 edition = "2021"

examples/client-cardano-database-v2/Cargo.toml

@@ -75,16 +75,20 @@ async fn main() -> MithrilResult<()> {
 
     let latest_hash = cardano_database_snapshots
         .first()
-        .ok_or(anyhow!(
-            "No Cardano database snapshot could be listed from aggregator: '{}'",
-            args.aggregator_endpoint
-        ))?
+        .with_context(|| {
+            format!(
+                "No Cardano database snapshot could be listed from aggregator: '{}'",
+                args.aggregator_endpoint
+            )
+        })?
         .hash
         .as_ref();
 
-    let cardano_database_snapshot = client.cardano_database_v2().get(latest_hash).await?.ok_or(
-        anyhow!("A Cardano database should exist for hash '{latest_hash}'"),
-    )?;
+    let cardano_database_snapshot = client
+        .cardano_database_v2()
+        .get(latest_hash)
+        .await?
+        .with_context(|| format!("A Cardano database should exist for hash '{latest_hash}'"))?;
 
     let unpacked_dir = work_dir.join("unpack");
     std::fs::create_dir(&unpacked_dir).unwrap();

examples/client-cardano-database-v2/src/main.rs

@@ -1,7 +1,7 @@
 [package]
 name = "client-cardano-database"
 description = "Mithril client Cardano database example"
-version = "0.1.38"
+version = "0.1.39"
 authors = ["[email protected]", "[email protected]"]
 documentation = "https://mithril.network/doc"
 edition = "2021"

examples/client-cardano-database/Cargo.toml

@@ -74,18 +74,20 @@ async fn main() -> MithrilResult<()> {
 
     let last_digest = snapshots
         .first()
-        .ok_or(anyhow!(
-            "No snapshots could be listed from aggregator: '{}'",
-            args.aggregator_endpoint
-        ))?
+        .with_context(|| {
+            format!(
+                "No snapshots could be listed from aggregator: '{}'",
+                args.aggregator_endpoint
+            )
+        })?
         .digest
         .as_ref();
 
     let snapshot = client
         .cardano_database()
         .get(last_digest)
         .await?
-        .ok_or(anyhow!("A snapshot should exist for hash '{last_digest}'"))?;
+        .with_context(|| format!("A snapshot should exist for hash '{last_digest}'"))?;
 
     let unpacked_dir = work_dir.join("unpack");
     std::fs::create_dir(&unpacked_dir).unwrap();

examples/client-cardano-database/src/main.rs

@@ -1,7 +1,7 @@
 [package]
 name = "client-cardano-stake-distribution"
 description = "Mithril client cardano stake distribution example"
-version = "0.1.14"
+version = "0.1.15"
 authors = ["[email protected]", "[email protected]"]
 documentation = "https://mithril.network/doc"
 edition = "2021"

examples/client-cardano-stake-distribution/Cargo.toml

@@ -2,7 +2,7 @@
 //!
 //! In this example, the client interacts by default with a real aggregator (`release-preprod`) to get the data.
 
-use anyhow::anyhow;
+use anyhow::Context;
 use clap::Parser;
 use slog::info;
 use std::{str::FromStr, sync::Arc};
@@ -57,19 +57,21 @@ async fn main() -> MithrilResult<()> {
 
     let last_epoch = cardano_stake_distributions
         .first()
-        .ok_or(anyhow!(
-            "No Cardano stake distributions could be listed from aggregator: '{}'",
-            args.aggregator_endpoint
-        ))?
+        .with_context(|| {
+            format!(
+                "No Cardano stake distributions could be listed from aggregator: '{}'",
+                args.aggregator_endpoint
+            )
+        })?
         .epoch;
 
     let cardano_stake_distribution = client
         .cardano_stake_distribution()
         .get_by_epoch(last_epoch)
         .await?
-        .ok_or(anyhow!(
-            "A Cardano stake distribution should exist for hash '{last_epoch}'"
-        ))?;
+        .with_context(|| {
+            format!("A Cardano stake distribution should exist for hash '{last_epoch}'")
+        })?;
     info!(
         logger,
         "Fetched details of last Cardano stake distribution:\n{cardano_stake_distribution:#?}",

examples/client-cardano-stake-distribution/src/main.rs

@@ -1,7 +1,7 @@
 [package]
 name = "client-mithril-stake-distribution"
 description = "Mithril client stake distribution example"
-version = "0.2.12"
+version = "0.2.13"
 authors = ["[email protected]", "[email protected]"]
 documentation = "https://mithril.network/doc"
 edition = "2021"

examples/client-mithril-stake-distribution/Cargo.toml

@@ -2,7 +2,7 @@
 //!
 //! In this example, the client interacts by default with a real aggregator (`release-preprod`) to get the data.
 
-use anyhow::anyhow;
+use anyhow::Context;
 use clap::Parser;
 use slog::info;
 use std::{str::FromStr, sync::Arc};
@@ -57,20 +57,22 @@ async fn main() -> MithrilResult<()> {
 
     let last_hash = mithril_stake_distributions
         .first()
-        .ok_or(anyhow!(
-            "No Mithril stake distributions could be listed from aggregator: '{}'",
-            args.aggregator_endpoint
-        ))?
+        .with_context(|| {
+            format!(
+                "No Mithril stake distributions could be listed from aggregator: '{}'",
+                args.aggregator_endpoint
+            )
+        })?
         .hash
         .as_ref();
 
     let mithril_stake_distribution = client
         .mithril_stake_distribution()
         .get(last_hash)
         .await?
-        .ok_or(anyhow!(
-            "A Mithril stake distribution should exist for hash '{last_hash}'"
-        ))?;
+        .with_context(|| {
+            format!("A Mithril stake distribution should exist for hash '{last_hash}'")
+        })?;
     info!(
         logger,
         "Fetched details of last Mithril stake distribution:\n{mithril_stake_distribution:#?}",