Merge branch 'dev' into issue-215-ethereum-channel-redundant-validator_id-check

Author: samparsky

adapter/src/ethereum.rs

@@ -145,7 +145,7 @@ impl Adapter for EthereumAdapter {
                 ));
             }
 
-            let contract_address = Address::from_slice(&self.config.ethereum_core_address);
+            let contract_address: Address = self.config.ethereum_core_address.into();
 
             let (_eloop, transport) = web3::transports::Http::new(&self.config.ethereum_network)
                 .map_err(|_| map_error("failed to init http transport"))?;
@@ -209,7 +209,7 @@ impl Adapter for EthereumAdapter {
 
             let sess = match &verified.payload.identity {
                 Some(identity) => {
-                    let contract_address = Address::from_slice(identity);
+                    let contract_address: Address = identity.into();
                     let (_eloop, transport) =
                         web3::transports::Http::new(&self.config.ethereum_network)
                             .map_err(|_| map_error("failed to init http transport"))?;

adapter/src/lib.rs

@@ -172,7 +172,7 @@ impl EthereumChannel {
     }
 
     pub fn hash_hex(&self, contract_addr: &[u8; 20]) -> Result<String, Box<dyn Error>> {
-        let result = self.hash(&contract_addr)?;
+        let result = self.hash(contract_addr)?;
         Ok(format!("0x{}", hex::encode(result)))
     }
 

primitives/src/validator.rs

@@ -32,18 +32,18 @@ impl ValidatorId {
     }
 }
 
-impl AsRef<[u8]> for ValidatorId {
-    fn as_ref(&self) -> &[u8] {
-        &self.0
-    }
-}
-
 impl From<&[u8; 20]> for ValidatorId {
     fn from(bytes: &[u8; 20]) -> Self {
         Self(*bytes)
     }
 }
 
+impl AsRef<[u8]> for ValidatorId {
+    fn as_ref(&self) -> &[u8] {
+        &self.0
+    }
+}
+
 impl TryFrom<&str> for ValidatorId {
     type Error = DomainError;
     fn try_from(value: &str) -> Result<Self, Self::Error> {

validator_worker/src/sentry_interface.rs

@@ -36,7 +36,7 @@ impl<T: Adapter + 'static> SentryApi<T> {
         let client = Client::builder()
             .timeout(Duration::from_secs(config.fetch_timeout.into()))
             .build()
-            .unwrap();
+            .map_err(|e| ValidatorWorker::Failed(format!("building Client error: {}", e)))?;
 
         // validate that we are to validate the channel
         match channel.spec.validators.find(adapter.whoami()) {