fix: removed uneeded clones & flags

Author: samparsky

adapter/src/ethereum.rs

@@ -79,7 +79,7 @@ impl Adapter for EthereumAdapter {
             }
         };
 
-        let identity = ValidatorId::try_from(address)?;
+        let identity = ValidatorId::try_from(address.as_str())?;
 
         Ok(Self {
             address: identity,
@@ -129,7 +129,7 @@ impl Adapter for EthereumAdapter {
     fn verify(&self, signer: &ValidatorId, state_root: &str, sig: &str) -> AdapterResult<bool> {
         let decoded_signature = hex::decode(sig)
             .map_err(|_| AdapterError::Signature("invalid signature".to_string()))?;
-        let address = Address::from_slice(signer.into_inner());
+        let address = Address::from_slice(&signer.inner());
         let signature = Signature::from_electrum(&decoded_signature);
         let message = Message::from_slice(&hash_message(state_root));
 
@@ -385,7 +385,7 @@ pub fn ewt_verify(
     let payload: Payload = serde_json::from_str(&payload_string)?;
 
     let verified_payload = VerifyPayload {
-        from: ValidatorId::try_from(format!("{:?}", address))?,
+        from: ValidatorId::try_from(format!("{:?}", address).as_str())?,
         payload,
     };
 

primitives/src/validator.rs

@@ -29,8 +29,8 @@ impl ValidatorId {
         format!("0x{}", hex::encode(self.0))
     }
 
-    pub fn into_inner(&self) -> &[u8; 20] {
-        &self.0
+    pub fn inner(&self) -> [u8; 20] {
+        self.0
     }
 
     pub fn to_hex_checksummed_string(&self) -> String {
@@ -40,14 +40,13 @@ impl ValidatorId {
 
 impl TryFrom<&str> for ValidatorId {
     type Error = DomainError;
-    // 0x prefixed string
     fn try_from(value: &str) -> Result<Self, Self::Error> {
-        // use hex::FromHex;
-        // @TODO: Should we have some constrains(like valid hex string starting with `0x`)? If not this should be just `From`.
-        let mut hex_value = value;
-        if value.len() == 42 {
-            hex_value = &value[2..];
-        }
+        let hex_value = if value.len() == 42 {
+            &value[2..]
+        } else {
+            value
+        };
+
         let result = hex::decode(hex_value).map_err(|_| {
             DomainError::InvalidArgument("Failed to deserialize validator id".to_string())
         })?;
@@ -57,23 +56,9 @@ impl TryFrom<&str> for ValidatorId {
     }
 }
 
-impl TryFrom<String> for ValidatorId {
-    type Error = DomainError;
-    // 0x prefixed string
-    fn try_from(value: String) -> Result<Self, Self::Error> {
-        // @TODO: Should we have some constrains(like valid hex string starting with `0x`)? If not this should be just `From`.
-        let result = hex::decode(&value[2..]).map_err(|_| {
-            DomainError::InvalidArgument("Failed to deserialize validator id".to_string())
-        })?;
-        let mut id: [u8; 20] = [0; 20];
-        id.copy_from_slice(&result[..]);
-        Ok(Self(id))
-    }
-}
-// returns a 0x prefix string
 impl Into<String> for ValidatorId {
     fn into(self) -> String {
-        format!("{}", hex::encode(self.0))
+        hex::encode(self.0)
     }
 }
 

validator_worker/src/heartbeat.rs

@@ -60,5 +60,5 @@ pub async fn heartbeat<A: Adapter + 'static>(
 }
 
 fn is_channel_not_exhausted(channel: &Channel, balances: &BalancesMap) -> bool {
-    !(balances.values().sum::<BigNum>() == channel.deposit_amount)
+    balances.values().sum::<BigNum>() != channel.deposit_amount
 }