primivies - ValidatorId change errors to address::Error

Author: elpiel

adapter/src/ethereum/error.rs

@@ -84,7 +84,7 @@ pub enum KeystoreError {
     /// `address` key is missing from the keystore file
     AddressMissing,
     /// The `address` key in the keystore file is not a valid `ValidatorId`
-    AddressInvalid(primitives::DomainError),
+    AddressInvalid(primitives::address::Error),
     /// reading the keystore file failed
     ReadingFile(std::io::Error),
     /// Deserializing the keystore file failed

primitives/src/lib.rs

@@ -74,6 +74,12 @@ impl fmt::Display for DomainError {
     }
 }
 
+impl From<address::Error> for DomainError {
+    fn from(error: address::Error) -> Self {
+        Self::InvalidArgument(error.to_string())
+    }
+}
+
 impl error::Error for DomainError {
     fn cause(&self) -> Option<&dyn error::Error> {
         None

primitives/src/sentry.rs

@@ -101,8 +101,10 @@ pub mod message {
             };
 
             pretty_assertions::assert_eq!(expected_message, actual_message);
-            pretty_assertions::assert_eq!(to_value(expected_message).expect("should serialize"), approve_state_message);
-            
+            pretty_assertions::assert_eq!(
+                to_value(expected_message).expect("should serialize"),
+                approve_state_message
+            );
         }
     }
 }

primitives/src/validator.rs

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 use std::{convert::TryFrom, fmt, str::FromStr};
 
-use crate::{targeting::Value, Address, BigNum, DomainError, ToETHChecksum, ToHex};
+use crate::{address::Error, targeting::Value, Address, BigNum, DomainError, ToETHChecksum, ToHex};
 
 pub use messages::*;
 
@@ -58,24 +58,22 @@ impl AsRef<[u8]> for ValidatorId {
 }
 
 impl FromStr for ValidatorId {
-    type Err = crate::address::Error;
+    type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         Address::try_from(s).map(Self)
     }
 }
 
 impl TryFrom<&str> for ValidatorId {
-    type Error = DomainError;
+    type Error = Error;
     fn try_from(value: &str) -> Result<Self, Self::Error> {
-        Address::try_from(value)
-            .map_err(|err| DomainError::InvalidArgument(err.to_string()))
-            .map(Self)
+        Address::try_from(value).map(Self)
     }
 }
 
 impl TryFrom<&String> for ValidatorId {
-    type Error = DomainError;
+    type Error = Error;
 
     fn try_from(value: &String) -> Result<Self, Self::Error> {
         Self::try_from(value.as_str())

sentry/src/routes/validator_message.rs

@@ -5,7 +5,6 @@ use primitives::adapter::Adapter;
 use primitives::sentry::ValidatorMessageResponse;
 use primitives::{Channel, DomainError, ValidatorId};
 use serde::Deserialize;
-use std::convert::TryFrom;
 
 #[derive(Deserialize)]
 pub struct ValidatorMessagesListQuery {
@@ -28,7 +27,7 @@ pub fn extract_params(from_path: &str) -> Result<(Option<ValidatorId>, Vec<Strin
         // filter an empty string
         .filter(|string| !string.is_empty())
         // then try to map it to ValidatorId
-        .map(|string| ValidatorId::try_from(*string))
+        .map(|string| string.parse())
         // Transpose in order to check for an error from the conversion
         .transpose()?;