Merge pull request #317 from AdExNetwork/hotfix-315-dont-allow-empty-accounting

Hotfix #315 Do not allow empty Accounting, skip them instead

Author: elpiel

adview-manager/src/lib.rs

@@ -154,7 +154,7 @@ pub fn apply_selection(campaigns: &[MarketChannel], options: &AdViewManagerOptio
 }
 
 fn is_video(ad_unit: &AdUnit) -> bool {
-    ad_unit.media_mime.split('/').nth(0) == Some("video")
+    ad_unit.media_mime.split('/').next() == Some("video")
 }
 
 fn calculate_target_score(a: &[TargetingTag], b: &[TargetingTag]) -> TargetingScore {

primitives/src/balances_map.rs

@@ -39,6 +39,14 @@ impl BalancesMap {
     pub fn insert(&mut self, key: ValidatorId, value: BigNum) -> Option<BigNum> {
         self.0.insert(key, value)
     }
+
+    pub fn len(&self) -> usize {
+        self.0.len()
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
 }
 
 impl FromIterator<(ValidatorId, BigNum)> for BalancesMap {

primitives/src/big_num.rs

@@ -1,5 +1,4 @@
 use std::convert::TryFrom;
-use std::error::Error;
 use std::iter::Sum;
 use std::ops::{Add, AddAssign, Div, Mul, Sub};
 use std::str::FromStr;
@@ -195,7 +194,7 @@ impl TryFrom<&str> for BigNum {
 
     fn try_from(num: &str) -> Result<Self, Self::Error> {
         let big_uint = BigUint::from_str(&num)
-            .map_err(|err| super::DomainError::InvalidArgument(err.description().to_string()))?;
+            .map_err(|err| super::DomainError::InvalidArgument(err.to_string()))?;
 
         Ok(Self(big_uint))
     }

primitives/src/config.rs

@@ -4,7 +4,6 @@ use lazy_static::lazy_static;
 use serde::{Deserialize, Serialize};
 use serde_hex::{SerHex, StrictPfx};
 use std::fs;
-use toml;
 
 lazy_static! {
     static ref DEVELOPMENT_CONFIG: Config =

validator_worker/src/producer.rs

@@ -28,20 +28,30 @@ pub async fn tick<A: Adapter + 'static>(iface: &SentryApi<A>) -> Result {
         .get_event_aggregates(accounting.last_event_aggregate)
         .await?;
 
-    if !aggrs.events.is_empty() {
+    if aggrs.events.is_empty() {
+        return Ok((accounting.balances, None));
+    }
+
+    let (balances, new_accounting) = merge_aggrs(&accounting, &aggrs.events, &iface.channel)?;
+
+    if new_accounting.balances.is_empty() {
         info!(
             iface.logger,
-            "channel {}: processing {} event aggregates",
+            "channel {}: empty Accounting balances, skipping propagation", iface.channel.id
+        );
+
+        Ok((balances, None))
+    } else {
+        info!(
+            iface.logger,
+            "channel {}: processed {} event aggregates",
             iface.channel.id,
             aggrs.events.len()
         );
-        let (balances, new_accounting) = merge_aggrs(&accounting, &aggrs.events, &iface.channel)?;
 
         let message_types = MessageTypes::Accounting(new_accounting.clone());
         iface.propagate(&[&message_types]).await;
 
         Ok((balances, Some(new_accounting)))
-    } else {
-        Ok((accounting.balances.clone(), None))
     }
 }