Move 'UnregisteredInitializer' to 'RegisterError'

Author: jpraynaud

mithril-core/src/error.rs

@@ -100,7 +100,7 @@ pub enum MerkleTreeError<D: Digest + FixedOutput> {
 }
 
 /// Errors which can be outputted by key registration.
-#[derive(Debug, Clone, thiserror::Error)]
+#[derive(Debug, Clone, thiserror::Error, PartialEq, Eq)]
 pub enum RegisterError {
     /// This key has already been registered by a participant
     #[error("This key has already been registered.")]
@@ -113,14 +113,10 @@ pub enum RegisterError {
     /// Serialization error
     #[error("Serialization error")]
     SerializationError,
-}
 
-/// Errors which can be outputted by an initializer.
-#[derive(Debug, Clone, thiserror::Error, PartialEq, Eq)]
-pub enum StmInitializerError {
-    /// NotRegistered error
+    /// UnregisteredInitializer error
     #[error("Initializer not registered. Cannot participate as a signer.")]
-    NotRegistered,
+    UnregisteredInitializer,
 }
 
 impl<D: Digest + FixedOutput> From<RegisterError> for StmSignatureError<D> {
@@ -129,6 +125,7 @@ impl<D: Digest + FixedOutput> From<RegisterError> for StmSignatureError<D> {
             RegisterError::SerializationError => Self::SerializationError,
             RegisterError::KeyInvalid(e) => Self::IvkInvalid(e.vk),
             RegisterError::KeyRegistered(_) => unreachable!(),
+            RegisterError::UnregisteredInitializer => unreachable!(),
         }
     }
 }

mithril-core/src/key_reg.rs

@@ -134,6 +134,7 @@ mod tests {
                         assert!(a.check().is_err());
                     }
                     Err(RegisterError::SerializationError) => unreachable!(),
+                    Err(RegisterError::UnregisteredInitializer) => unreachable!(),
                 }
             }
 

mithril-core/src/lib.rs

@@ -10,4 +10,4 @@ pub mod stm;
 
 mod multi_sig;
 
-pub use crate::error::{AggregationError, StmInitializerError};
+pub use crate::error::{AggregationError, RegisterError};

mithril-core/src/stm.rs

@@ -106,7 +106,7 @@
 //! ```
 
 use crate::dense_mapping::ev_lt_phi;
-use crate::error::{AggregationError, RegisterError, StmInitializerError, StmSignatureError};
+use crate::error::{AggregationError, RegisterError, StmSignatureError};
 use crate::key_reg::ClosedKeyReg;
 use crate::merkle_tree::{MTLeaf, MerkleTreeCommitment, Path};
 use crate::multi_sig::{Signature, SigningKey, VerificationKey, VerificationKeyPoP};
@@ -293,7 +293,7 @@ impl StmInitializer {
     pub fn new_signer<D: Digest + FixedOutput + Clone>(
         self,
         closed_reg: ClosedKeyReg<D>,
-    ) -> Result<StmSigner<D>, StmInitializerError> {
+    ) -> Result<StmSigner<D>, RegisterError> {
         let mut my_index = None;
         for (i, rp) in closed_reg.reg_parties.iter().enumerate() {
             if rp.0 == self.pk.vk {
@@ -302,7 +302,7 @@ impl StmInitializer {
             }
         }
         if my_index.is_none() {
-            return Err(StmInitializerError::NotRegistered);
+            return Err(RegisterError::UnregisteredInitializer);
         }
 
         Ok(StmSigner {

mithril-signer/src/single_signer.rs

@@ -2,7 +2,7 @@ use hex::ToHex;
 use slog_scope::{info, trace, warn};
 use thiserror::Error;
 
-use mithril::StmInitializerError;
+use mithril::RegisterError;
 use mithril_common::crypto_helper::{
     key_decode_hex, key_encode_hex, ProtocolClerk, ProtocolInitializer, ProtocolKeyRegistration,
     ProtocolSigner,
@@ -83,7 +83,7 @@ pub enum SingleSignerError {
 
     /// Could not fetch a signer from a protocol initializer.
     #[error("the protocol initializer is not registered")]
-    ProtocolInitializerNotRegistered(#[from] StmInitializerError),
+    ProtocolInitializerNotRegistered(#[from] RegisterError),
 
     /// Encoding / Decoding error.
     #[error("codec error: '{0}'")]