fix: remove balancesmpa, newstateresult

Author: samparsky

adapter/src/ethereum.rs

@@ -536,7 +536,7 @@ mod test {
                 .expect("Valid ValidatorId"),
             payload: Payload {
                 id: "awesomeValidator".to_string(),
-                era: 100000,
+                era: 100_000,
                 address: "0x2bDeAFAE53940669DaA6F519373f686c1f3d3393".to_string(),
                 identity: None,
             },

validator_worker/src/core/events.rs

@@ -10,7 +10,7 @@ pub(crate) fn merge_aggrs(
     accounting: &Accounting,
     aggregates: &[EventAggregate],
     channel: &Channel,
-) -> Result<(BalancesMap, Accounting), DomainError> {
+) -> Result<Accounting, DomainError> {
     let deposit = channel.deposit_amount.clone();
 
     let last_event_aggregate = [accounting.last_event_aggregate]
@@ -35,10 +35,10 @@ pub(crate) fn merge_aggrs(
     let new_accounting = Accounting {
         last_event_aggregate,
         balances_before_fees,
-        balances: balances.clone(),
+        balances
     };
 
-    Ok((balances, new_accounting))
+    Ok(new_accounting)
 }
 
 fn merge_payouts_into_balances<'a, T: Iterator<Item = &'a AggregateEvents>>(
@@ -115,11 +115,10 @@ mod test {
             balances: BalancesMap::default(),
         };
 
-        let (balances, new_accounting) =
+        let new_accounting =
             merge_aggrs(&acc, &[gen_ev_aggr(5, &IDS["publisher"])], &channel)
                 .expect("Something went wrong");
 
-        assert_eq!(balances, new_accounting.balances, "balances is the same");
         assert_eq!(
             new_accounting.balances_before_fees[&IDS["publisher"]],
             150.into(),
@@ -166,11 +165,10 @@ mod test {
             balances: BalancesMap::default(),
         };
 
-        let (balances, new_accounting) =
+        let new_accounting =
             merge_aggrs(&acc, &[gen_ev_aggr(1_001, &IDS["publisher"])], &channel)
                 .expect("Something went wrong");
 
-        assert_eq!(balances, new_accounting.balances, "balances is the same");
         assert_eq!(
             new_accounting.balances_before_fees[&IDS["publisher"]],
             9_800.into(),

validator_worker/src/follower.rs

@@ -79,7 +79,7 @@ pub async fn tick<A: Adapter + 'static>(
 
     let producer_tick = producer::tick(&iface).await?;
     let balances = match &producer_tick {
-        producer::TickStatus::Sent { balances, .. } => balances,
+        producer::TickStatus::Sent { new_accounting, .. } => &new_accounting.balances,
         producer::TickStatus::NoNewEventAggr(balances) => balances,
     };
     let approve_state_result = if let (Some(new_state), false) = (new_msg, latest_is_responded_to) {

validator_worker/src/leader.rs

@@ -2,7 +2,6 @@ use std::error::Error;
 
 use primitives::adapter::{Adapter, AdapterErrorKind};
 use primitives::validator::{Accounting, MessageTypes, NewState};
-use primitives::BalancesMap;
 
 use crate::heartbeat::{heartbeat, HeartbeatStatus};
 use crate::sentry_interface::{PropagationResult, SentryApi};
@@ -19,7 +18,7 @@ pub enum NewStateResult<AE: AdapterErrorKind> {
 pub struct TickStatus<AE: AdapterErrorKind> {
     pub heartbeat: HeartbeatStatus<AE>,
     /// If None, then the conditions for handling a new state haven't been met
-    pub new_state: NewStateResult<AE>,
+    pub new_state: Option<Vec<PropagationResult<AE>>>,
     pub producer_tick: producer::TickStatus<AE>,
 }
 
@@ -29,14 +28,13 @@ pub async fn tick<A: Adapter + 'static>(
     let producer_tick = producer::tick(&iface).await?;
     let (balances, new_state) = match &producer_tick {
         producer::TickStatus::Sent {
-            balances,
             new_accounting,
             ..
         } => {
-            let new_state = on_new_accounting(&iface, (balances, new_accounting)).await?;
-            (balances, new_state)
+            let new_state = on_new_accounting(&iface, new_accounting).await?;
+            (&new_accounting.balances, Some(new_state))
         }
-        producer::TickStatus::NoNewEventAggr(balances) => (balances, NewStateResult::NotSent),
+        producer::TickStatus::NoNewEventAggr(balances) => (balances, None),
     };
 
     Ok(TickStatus {
@@ -48,9 +46,9 @@ pub async fn tick<A: Adapter + 'static>(
 
 async fn on_new_accounting<A: Adapter + 'static>(
     iface: &SentryApi<A>,
-    (balances, new_accounting): (&BalancesMap, &Accounting),
-) -> Result<NewStateResult<A::AdapterError>, Box<dyn Error>> {
-    let state_root_raw = get_state_root_hash(&iface, &balances)?;
+    new_accounting: &Accounting,
+) -> Result<Vec<PropagationResult<A::AdapterError>>, Box<dyn Error>> {
+    let state_root_raw = get_state_root_hash(&iface, &new_accounting.balances)?;
     let state_root = hex::encode(state_root_raw);
 
     let signature = iface.adapter.sign(&state_root)?;
@@ -63,5 +61,5 @@ async fn on_new_accounting<A: Adapter + 'static>(
         })])
         .await;
 
-    Ok(NewStateResult::Sent(propagation_results))
+    Ok(propagation_results)
 }

validator_worker/src/producer.rs

@@ -13,7 +13,7 @@ use crate::sentry_interface::{PropagationResult, SentryApi};
 pub enum TickStatus<AE: AdapterErrorKind> {
     Sent {
         channel: ChannelId,
-        balances: BalancesMap,
+        // balances: BalancesMap,
         new_accounting: Accounting,
         accounting_propagation: Vec<PropagationResult<AE>>,
         event_counts: usize,
@@ -40,14 +40,13 @@ pub async fn tick<A: Adapter + 'static>(
         .await?;
 
     if !aggrs.events.is_empty() {
-        let (balances, new_accounting) = merge_aggrs(&accounting, &aggrs.events, &iface.channel)?;
+        let new_accounting = merge_aggrs(&accounting, &aggrs.events, &iface.channel)?;
 
         let message_types = MessageTypes::Accounting(new_accounting.clone());
 
         Ok(TickStatus::Sent {
             channel: iface.channel.id,
             accounting_propagation: iface.propagate(&[&message_types]).await,
-            balances,
             new_accounting,
             event_counts: aggrs.events.len(),
         })