fix: get_state_root_hash param

Author: samparsky

adapter/src/lib.rs

@@ -11,7 +11,7 @@ use ethabi::token::{LenientTokenizer, StrictTokenizer, Tokenizer};
 use hex::FromHex;
 use primitives::channel::ChannelError;
 use primitives::BigNum;
-use primitives::Channel;
+use primitives::{Channel, ValidatorId};
 use sha2::{Digest, Sha256};
 use std::convert::TryFrom;
 use tiny_keccak::Keccak;
@@ -46,9 +46,9 @@ pub fn get_signable_state_root(
     Ok(res)
 }
 
-pub fn get_balance_leaf(acc: &[u8; 20], amnt: &BigNum) -> Result<[u8; 32], Box<dyn Error>> {
+pub fn get_balance_leaf(acc: &ValidatorId, amnt: &BigNum) -> Result<[u8; 32], Box<dyn Error>> {
     let params = [
-        (ParamType::Address, &hex::encode(acc)[..]),
+        (ParamType::Address, &acc.to_string()[..]),
         (ParamType::Uint(256), &amnt.to_str_radix(10)[..]),
     ];
     let encoded = encode_params(&params, true)?;

validator_worker/src/lib.rs

@@ -4,10 +4,10 @@
 use std::error::Error;
 
 use adapter::{get_balance_leaf, get_signable_state_root};
-use hex::FromHex;
 use primitives::adapter::Adapter;
 use primitives::merkle_tree::MerkleTree;
-use primitives::BalancesMap;
+use primitives::{BalancesMap, ValidatorId};
+use std::convert::TryFrom;
 
 pub use self::sentry_interface::{all_channels, SentryApi};
 
@@ -31,12 +31,7 @@ pub(crate) fn get_state_root_hash<A: Adapter + 'static>(
     // Note: MerkleTree takes care of deduplicating and sorting
     let elems: Vec<[u8; 32]> = balances
         .iter()
-        .map(|(acc, amount)| {
-            get_balance_leaf(
-                &<[u8; 20]>::from_hex(&acc[2..]).expect("failed to unwrap ex"),
-                amount,
-            )
-        })
+        .map(|(acc, amount)| get_balance_leaf(&ValidatorId::try_from(acc.as_str())?, amount))
         .collect::<Result<_, _>>()?;
 
     let tree = MerkleTree::new(&elems);