fix: sentry_interface, adapter.whoami() -> &ValidatorId, rename is_channel_not_exhausted

Author: samparsky

adapter/src/dummy.rs

@@ -34,15 +34,15 @@ impl Adapter for DummyAdapter {
         Ok(())
     }
 
-    fn whoami(&self) -> ValidatorId {
-        self.identity.clone()
+    fn whoami(&self) -> &ValidatorId {
+        &self.identity
     }
 
     fn sign(&self, state_root: &str) -> AdapterResult<String> {
         let signature = format!(
             "Dummy adapter signature for {} by {}",
             state_root,
-            self.whoami().to_string()
+            self.whoami()
         );
         Ok(signature)
     }

adapter/src/ethereum.rs

@@ -95,8 +95,8 @@ impl Adapter for EthereumAdapter {
         Ok(())
     }
 
-    fn whoami(&self) -> ValidatorId {
-        self.address.clone()
+    fn whoami(&self) -> &ValidatorId {
+        &self.address
     }
 
     fn sign(&self, state_root: &str) -> AdapterResult<String> {

adapter/src/lib.rs

@@ -195,8 +195,8 @@ impl EthereumChannel {
         contract_addr: &str,
         balance_root: &str,
     ) -> Result<[u8; 32], Box<dyn Error>> {
-        let root = <[u8; 32]>::from_hex(balance_root).unwrap();
-        let addr = hex::decode(contract_addr).unwrap();
+        let root = <[u8; 32]>::from_hex(balance_root)?;
+        let addr = hex::decode(contract_addr)?;
         get_signable_state_root(&addr, &root)
     }
 

primitives/src/adapter.rs

@@ -64,7 +64,7 @@ pub trait Adapter: ChannelValidator + Send + Clone + Debug {
     fn unlock(&mut self) -> AdapterResult<()>;
 
     /// Get Adapter whoami
-    fn whoami(&self) -> ValidatorId;
+    fn whoami(&self) -> &ValidatorId;
 
     /// Signs the provided state_root
     fn sign(&self, state_root: &str) -> AdapterResult<String>;

primitives/src/channel.rs

@@ -105,10 +105,10 @@ impl SpecValidators {
         &self.0[1]
     }
 
-    pub fn find(&self, validator_id: ValidatorId) -> SpecValidator<'_> {
-        if self.leader().id == validator_id {
+    pub fn find(&self, validator_id: &ValidatorId) -> SpecValidator<'_> {
+        if &self.leader().id == validator_id {
             SpecValidator::Leader(&self.leader())
-        } else if self.follower().id == validator_id {
+        } else if &self.follower().id == validator_id {
             SpecValidator::Follower(&self.follower())
         } else {
             SpecValidator::None

primitives/src/channel_validator.rs

@@ -10,7 +10,7 @@ pub trait ChannelValidator {
         let validator_identity = ValidatorId::try_from(&identity[..]).map_err(|_| {
             ChannelError::InvalidArgument("Failed to deserialize identity".to_string())
         })?;
-        let adapter_channel_validator = match channel.spec.validators.find(validator_identity) {
+        let adapter_channel_validator = match channel.spec.validators.find(&validator_identity) {
             // check if the channel validators include our adapter identity
             SpecValidator::None => return Err(ChannelError::AdapterNotIncluded),
             SpecValidator::Leader(validator) | SpecValidator::Follower(validator) => validator,

validator_worker/src/core/fees.rs

@@ -77,7 +77,7 @@ fn distribute_fee<'a>(
 
         if fee_rounded > 0.into() {
             let entry = balances
-                .entry(validator.id.to_string().clone())
+                .entry(validator.id.to_string())
                 .or_insert_with(|| 0.into());
 
             *entry += &fee_rounded;

validator_worker/src/heartbeat.rs

@@ -49,7 +49,7 @@ pub async fn heartbeat<A: Adapter + 'static>(
     let should_send = heartbeat_msg.map_or(true, |heartbeat| {
         let duration = Utc::now() - heartbeat.timestamp;
         duration > Duration::milliseconds(iface.config.heartbeat_time.into())
-            && is_channel_not_exhausted(&iface.channel, &balances)
+            && !is_channel_exhausted(&iface.channel, &balances)
     });
 
     if should_send {
@@ -59,6 +59,6 @@ pub async fn heartbeat<A: Adapter + 'static>(
     Ok(())
 }
 
-fn is_channel_not_exhausted(channel: &Channel, balances: &BalancesMap) -> bool {
-    balances.values().sum::<BigNum>() != channel.deposit_amount
+fn is_channel_exhausted(channel: &Channel, balances: &BalancesMap) -> bool {
+    balances.values().sum::<BigNum>() == channel.deposit_amount
 }

validator_worker/src/lib.rs

@@ -59,7 +59,7 @@ mod test {
         };
         let config = configuration("development", None).expect("Dev config should be available");
         let dummy_adapter = DummyAdapter::init(adapter_options, &config);
-        let whoami = dummy_adapter.whoami();
+        let whoami = dummy_adapter.whoami().clone();
 
         SentryApi::init(
             Arc::new(RwLock::new(dummy_adapter)),

validator_worker/src/main.rs

@@ -127,7 +127,7 @@ fn run<A: Adapter + 'static>(
     adapter: A,
 ) -> Result<(), Box<dyn Error>> {
     let sentry_adapter = Arc::new(RwLock::new(adapter.clone()));
-    let whoami = adapter.whoami();
+    let whoami = adapter.whoami().to_owned();
 
     let args = Args {
         sentry_url: sentry_url.to_owned(),
@@ -196,7 +196,7 @@ async fn validator_tick<A: Adapter + 'static>(
     let sentry = SentryApi::init(adapter, &channel, &config, true, whoami)?;
     let duration = Duration::from_secs(config.validator_tick_timeout as u64);
 
-    match channel.spec.validators.find(whoami.to_owned()) {
+    match channel.spec.validators.find(&whoami) {
         SpecValidator::Leader(_) => {
             if let Err(e) = leader::tick(&sentry)
                 .boxed()