Merge branch 'dev' into issue-113-remove-Distribution-struct

Author: samparsky

validator_worker/src/core/events.rs

@@ -9,8 +9,7 @@ use primitives::sentry::{AggregateEvents, EventAggregate};
 use primitives::validator::Accounting;
 use primitives::{BalancesMap, BigNum, Channel, DomainError};
 
-#[allow(dead_code)]
-fn merge_aggrs(
+pub(crate) fn merge_aggrs(
     accounting: &Accounting,
     aggregates: &[EventAggregate],
     channel: &Channel,

validator_worker/src/lib.rs

@@ -6,6 +6,7 @@
 pub mod error;
 pub mod follower;
 pub mod leader;
+pub mod producer;
 pub mod sentry_interface;
 
 pub use self::follower::Follower;

validator_worker/src/producer.rs

@@ -0,0 +1,43 @@
+use std::error::Error;
+
+use chrono::{TimeZone, Utc};
+
+use primitives::adapter::Adapter;
+use primitives::validator::{Accounting, MessageTypes};
+use primitives::{BalancesMap, Channel};
+
+use crate::core::events::merge_aggrs;
+use crate::sentry_interface::SentryApi;
+
+pub type Result = std::result::Result<(BalancesMap, Option<MessageTypes>), Box<dyn Error>>;
+
+pub async fn tick<A: Adapter + 'static>(iface: &SentryApi<A>) -> Result {
+    let validator_msg_resp = await!(iface.get_our_latest_msg("Accounting".to_owned()))?;
+
+    let accounting = validator_msg_resp
+        .msg
+        .get(0)
+        .and_then(|accounting| match accounting {
+            MessageTypes::Accounting(accounting) => Some(accounting.to_owned()),
+            _ => None,
+        })
+        .unwrap_or_else(|| Accounting {
+            last_event_aggregate: Utc.timestamp(0, 0),
+            balances_before_fees: Default::default(),
+            balances: Default::default(),
+        });
+
+    let aggrs = await!(iface.get_event_aggregates(accounting.last_event_aggregate))?;
+
+    if !aggrs.events.is_empty() {
+        // TODO: Log the merge
+        let (balances, new_accounting) = merge_aggrs(&accounting, &aggrs.events, &iface.channel)?;
+
+        let message_types = MessageTypes::Accounting(new_accounting);
+        iface.propagate(vec![message_types.clone()]);
+
+        Ok((balances, Some(message_types)))
+    } else {
+        Ok((accounting.balances.clone(), None))
+    }
+}