Merge pull request #1223 from input-output-hk/greg/798/error_refacto_common_era

Use anyhow in Era framework

Author: ghubertpalo

mithril-aggregator/src/dependency_injection/builder.rs

@@ -734,7 +734,7 @@ impl DependenciesBuilder {
             era_epoch_token.get_current_supported_era().map_err(|e| {
                 DependenciesBuilderError::Initialization {
                     message: "Error while building EraChecker".to_string(),
-                    error: Some(e.into()),
+                    error: Some(e),
                 }
             })?,
             era_epoch_token.get_current_epoch(),

mithril-aggregator/src/runtime/state_machine.rs

@@ -393,7 +393,6 @@ mod tests {
     use mockall::predicate;
 
     use mithril_common::entities::{Epoch, SignedEntityType};
-    use mithril_common::era::UnsupportedEraError;
     use mithril_common::test_utils::fake_data;
 
     use super::super::runner::MockAggregatorRunner;
@@ -793,7 +792,7 @@ mod tests {
             .expect_update_era_checker()
             .with(predicate::eq(fake_data::beacon()))
             .once()
-            .returning(|_| Err(UnsupportedEraError::new("whatever").into()));
+            .returning(|_| Err(anyhow!("ERROR")));
         runner
             .expect_close_signer_registration_round()
             .once()

mithril-common/src/era/era_reader.rs

@@ -1,3 +1,4 @@
+use anyhow::anyhow;
 use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
 use std::{str::FromStr, sync::Arc};
@@ -6,7 +7,7 @@ use thiserror::Error;
 use crate::entities::Epoch;
 use crate::{StdError, StdResult};
 
-use super::{supported_era::UnsupportedEraError, SupportedEra};
+use super::SupportedEra;
 
 /// Value object that represents a tag of Era change.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -57,9 +58,9 @@ impl EraEpochToken {
     /// Try to cast the current [EraMarker] to a [SupportedEra]. If it fails,
     /// that means the current Era is not supported by this version of the
     /// software.
-    pub fn get_current_supported_era(&self) -> Result<SupportedEra, UnsupportedEraError> {
+    pub fn get_current_supported_era(&self) -> StdResult<SupportedEra> {
         SupportedEra::from_str(&self.current_era.name)
-            .map_err(|_| UnsupportedEraError::new(&self.current_era.name))
+            .map_err(|_| anyhow!(format!("Unsupported era '{}'.", &self.current_era.name)))
     }
 
     /// Return the [EraMarker] of the current Era.
@@ -76,11 +77,11 @@ impl EraEpochToken {
     /// means the coming Era will not be supported by this version of the
     /// software. This mechanism is used to issue a warning to the user asking
     /// for upgrade.
-    pub fn get_next_supported_era(&self) -> Result<Option<SupportedEra>, UnsupportedEraError> {
+    pub fn get_next_supported_era(&self) -> StdResult<Option<SupportedEra>> {
         match self.next_era.as_ref() {
             Some(marker) => Ok(Some(
                 SupportedEra::from_str(&marker.name)
-                    .map_err(|_| UnsupportedEraError::new(&self.current_era.name))?,
+                    .map_err(|_| anyhow!(format!("Unsupported era '{}'.", &marker.name)))?,
             )),
             None => Ok(None),
         }

mithril-common/src/era/supported_era.rs

@@ -1,22 +1,5 @@
 use serde::{Deserialize, Serialize};
 use strum::{Display, EnumIter, EnumString, IntoEnumIterator};
-use thiserror::Error;
-
-/// Error related to [SupportedEra] String parsing implementation.
-#[derive(Debug, Error)]
-#[error("Unsupported Era '{era}'.")]
-pub struct UnsupportedEraError {
-    era: String,
-}
-
-impl UnsupportedEraError {
-    /// Create a new Era Error
-    pub fn new(era: &str) -> Self {
-        Self {
-            era: era.to_owned(),
-        }
-    }
-}
 
 /// The era that the software is running or will run
 #[derive(