fix: keystore json err message

Author: samparsky

adapter/src/ethereum.rs

@@ -23,8 +23,10 @@ use web3::{
 };
 
 lazy_static! {
-    static ref ADEXCORE_ABI: &'static [u8] = include_bytes!("../../lib/protocol-eth/abi/AdExCore.json");
-    static ref IDENTITY_ABI: &'static [u8] = include_bytes!("../../lib/protocol-eth/abi/Identity.json");
+    static ref ADEXCORE_ABI: &'static [u8] =
+        include_bytes!("../../lib/protocol-eth/abi/AdExCore.json");
+    static ref IDENTITY_ABI: &'static [u8] =
+        include_bytes!("../../lib/protocol-eth/abi/Identity.json");
 }
 
 #[derive(Debug, Clone)]
@@ -70,7 +72,7 @@ impl Adapter for EthereumAdapter {
 
         let account = SafeAccount::from_file(
             serde_json::from_reader(json_file)
-                .map_err(|_| map_error("Invalid keystore location provided"))?,
+                .map_err(|_| map_error("Invalid keystore json provided"))?,
             None,
             &Some(self.keystore_pwd.clone()),
         )

primitives/src/adapter.rs

@@ -15,7 +15,6 @@ pub enum AdapterError {
     Configuration(String),
     Signature(String),
     InvalidChannel(String),
-    IO(String),
     Failed(String),
 }
 
@@ -30,8 +29,7 @@ impl fmt::Display for AdapterError {
             AdapterError::Configuration(error) => write!(f, "Configuration error: {}", error),
             AdapterError::Signature(error) => write!(f, "Signature error: {}", error),
             AdapterError::InvalidChannel(error) => write!(f, "Invalid Channel error: {}", error),
-            AdapterError::IO(error) => write!(f, "IO error: {}", error),
-            AdapterError::Failed(error) => write!(f, "IO error: {}", error),
+            AdapterError::Failed(error) => write!(f, "error: {}", error),
         }
     }
 }

validator_worker/src/heartbeat.rs

@@ -57,7 +57,7 @@ pub async fn heartbeat<A: Adapter + 'static>(
     });
 
     if should_send {
-        await!(send_heartbeat(iface))?;
+        await!(send_heartbeat(&iface))?;
     }
 
     Ok(())