Refactor Protocol Initializer builder error

Author: jpraynaud

mithril-common/src/crypto_helper/types.rs

@@ -1,5 +1,6 @@
 use crate::crypto_helper::cardano::{
-    KeyRegWrapper, ProtocolRegistrationErrorWrapper, StmInitializerWrapper,
+    KeyRegWrapper, ProtocolInitializerErrorWrapper, ProtocolRegistrationErrorWrapper,
+    StmInitializerWrapper,
 };
 
 use mithril_stm::stm::{
@@ -70,8 +71,11 @@ pub type ProtocolGenesisSecretKey = ed25519_dalek::SecretKey;
 pub type ProtocolGenesisSignature = ed25519_dalek::Signature;
 
 // Error alias
-/// Alias of a wrapper of [MithrilStm:RegisterError](enum@mithril_stm::RegisterError).
+/// Alias of a wrapper of [MithrilCommon:ProtocolRegistrationErrorWrapper](enum@mithril_common::ProtocolRegistrationErrorWrapper).
 pub type ProtocolRegistrationError = ProtocolRegistrationErrorWrapper;
 
+/// Alias of a wrapper of [MithrilCommon:ProtocolInitializerErrorWrapper](enum@mithril_common::ProtocolInitializerErrorWrapper).
+pub type ProtocolInitializerError = ProtocolInitializerErrorWrapper;
+
 /// Alias of [MithrilStm:AggregationError](enum@mithril_stm::AggregationError).
 pub type ProtocolAggregationError = AggregationError;

mithril-signer/src/single_signer.rs

@@ -5,8 +5,8 @@ use thiserror::Error;
 
 use mithril_common::crypto_helper::{
     key_decode_hex, key_encode_hex, KESPeriod, ProtocolClerk, ProtocolInitializer,
-    ProtocolKeyRegistration, ProtocolPartyId, ProtocolRegistrationError, ProtocolSigner,
-    ProtocolStakeDistribution,
+    ProtocolInitializerError, ProtocolKeyRegistration, ProtocolPartyId, ProtocolRegistrationError,
+    ProtocolSigner, ProtocolStakeDistribution,
 };
 use mithril_common::entities::{
     PartyId, ProtocolMessage, ProtocolParameters, SignerWithStake, SingleSignatures, Stake,
@@ -15,14 +15,6 @@ use mithril_common::entities::{
 #[cfg(test)]
 use mockall::automock;
 
-/// MithrilProtocolInitializerBuilder error structure.
-#[derive(Error, Debug)]
-pub enum MithrilProtocolInitializerBuilderError {
-    /// Could not parse a Cardano crypto file
-    #[error("the cardano cryptographic file could not be parsed.")]
-    CardanoCryptoParse,
-}
-
 /// This is responsible of creating new instances of ProtocolInitializer.
 #[derive(Default)]
 pub struct MithrilProtocolInitializerBuilder {}
@@ -40,16 +32,15 @@ impl MithrilProtocolInitializerBuilder {
         protocol_parameters: &ProtocolParameters,
         kes_secret_key_path: Option<PathBuf>,
         kes_period: Option<KESPeriod>,
-    ) -> Result<ProtocolInitializer, MithrilProtocolInitializerBuilderError> {
+    ) -> Result<ProtocolInitializer, ProtocolInitializerError> {
         let mut rng = rand_core::OsRng;
         let protocol_initializer = ProtocolInitializer::setup(
             protocol_parameters.to_owned().into(),
             kes_secret_key_path,
             kes_period,
             stake.to_owned(),
             &mut rng,
-        )
-        .map_err(|_| MithrilProtocolInitializerBuilderError::CardanoCryptoParse)?;
+        )?;
 
         Ok(protocol_initializer)
     }