fix: ethereum adapter whoami

Author: samparsky

adapter/src/ethereum.rs

@@ -10,11 +10,11 @@ use primitives::{
     Channel, ValidatorDesc,
 };
 use serde::{Deserialize, Serialize};
+use serde_json::Value;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::error::Error;
-use std::fs::File;
-use std::path::Path;
+use std::fs;
 use tiny_keccak::Keccak;
 use web3::transports::Http;
 use web3::{
@@ -32,7 +32,7 @@ lazy_static! {
 
 #[derive(Debug, Clone)]
 pub struct EthereumAdapter {
-    keystore_json: String,
+    keystore_json: Value,
     keystore_pwd: Password,
     config: Config,
     // Auth tokens that we have verified (tokenId => session)
@@ -59,8 +59,12 @@ impl Adapter for EthereumAdapter {
             }
         };
 
+        let keystore_contents = fs::read_to_string(&keystore_json)
+            .map_err(|_| map_error("Invalid keystore location provided"))?;
+
         Ok(Self {
-            keystore_json,
+            keystore_json: serde_json::from_str(&keystore_contents)
+                .map_err(|_| map_error("Invalid keystore json provided"))?,
             keystore_pwd: keystore_pwd.into(),
             session_tokens: RefCell::new(HashMap::new()),
             authorization_tokens: RefCell::new(HashMap::new()),
@@ -70,11 +74,8 @@ impl Adapter for EthereumAdapter {
     }
 
     fn unlock(&self) -> AdapterResult<bool> {
-        let json_file = File::open(&Path::new(&self.keystore_json).to_path_buf())
-            .map_err(|_| map_error("Invalid keystore location provided"))?;
-
         let account = SafeAccount::from_file(
-            serde_json::from_reader(json_file)
+            serde_json::from_value(self.keystore_json.clone())
                 .map_err(|_| map_error("Invalid keystore json provided"))?,
             None,
             &Some(self.keystore_pwd.clone()),
@@ -88,16 +89,10 @@ impl Adapter for EthereumAdapter {
     }
 
     fn whoami(&self) -> AdapterResult<String> {
-        match self.wallet.borrow().clone() {
-            Some(wallet) => {
-                let public = wallet
-                    .public(&self.keystore_pwd)
-                    .map_err(|_| map_error("Failed to get public key"))?;
-                let address = format!("{:?}", public_to_address(&public));
-                Ok(eth_checksum::checksum(&address))
-            }
-            None => Err(AdapterError::Configuration(
-                "Unlock wallet before use".to_string(),
+        match self.keystore_json["address"].as_str() {
+            Some(addr) => Ok(eth_checksum::checksum(&addr)),
+            None => Err(AdapterError::Failed(
+                "address missing in keystore json".to_string(),
             )),
         }
     }
@@ -188,7 +183,7 @@ impl Adapter for EthereumAdapter {
         if token.len() < 16 {
             return Err(AdapterError::Failed("invaild token id".to_string()));
         }
-        
+
         let token_id = token.to_owned()[token.len() - 16..].to_string();
 
         let mut session_tokens = self.session_tokens.borrow_mut();
@@ -445,14 +440,14 @@ mod test {
     fn should_get_whoami_sign_and_verify_messages() {
         // whoami
         let eth_adapter = setup_eth_adapter();
-        eth_adapter.unlock().expect("should unlock eth adapter");
-
         let whoami = eth_adapter.whoami().expect("failed to get whoami");
         assert_eq!(
             whoami, "0x2bDeAFAE53940669DaA6F519373f686c1f3d3393",
             "failed to get correct whoami"
         );
 
+        eth_adapter.unlock().expect("should unlock eth adapter");
+
         // Sign
         let expected_response =
             "0xce654de0b3d14d63e1cb3181eee7a7a37ef4a06c9fabc204faf96f26357441b625b1be460fbe8f5278cc02aa88a5d0ac2f238e9e3b8e4893760d33bccf77e47f1b";