fix: remove unused enums, impl

Author: samparsky

validator_worker/src/core/events.rs

@@ -35,7 +35,7 @@ pub(crate) fn merge_aggrs(
     let new_accounting = Accounting {
         last_event_aggregate,
         balances_before_fees,
-        balances
+        balances,
     };
 
     Ok(new_accounting)
@@ -115,9 +115,8 @@ mod test {
             balances: BalancesMap::default(),
         };
 
-        let new_accounting =
-            merge_aggrs(&acc, &[gen_ev_aggr(5, &IDS["publisher"])], &channel)
-                .expect("Something went wrong");
+        let new_accounting = merge_aggrs(&acc, &[gen_ev_aggr(5, &IDS["publisher"])], &channel)
+            .expect("Something went wrong");
 
         assert_eq!(
             new_accounting.balances_before_fees[&IDS["publisher"]],
@@ -165,9 +164,8 @@ mod test {
             balances: BalancesMap::default(),
         };
 
-        let new_accounting =
-            merge_aggrs(&acc, &[gen_ev_aggr(1_001, &IDS["publisher"])], &channel)
-                .expect("Something went wrong");
+        let new_accounting = merge_aggrs(&acc, &[gen_ev_aggr(1_001, &IDS["publisher"])], &channel)
+            .expect("Something went wrong");
 
         assert_eq!(
             new_accounting.balances_before_fees[&IDS["publisher"]],

validator_worker/src/follower.rs

@@ -36,12 +36,12 @@ impl fmt::Display for InvalidNewState {
 
 #[derive(Debug)]
 pub enum ApproveStateResult<AE: AdapterErrorKind> {
-    Sent(Vec<PropagationResult<AE>>),
-    /// Conditions for handling the new state haven't been met
-    NotSent,
+    /// If None, Conditions for handling the new state haven't been met
+    Sent(Option<Vec<PropagationResult<AE>>>),
     RejectedState {
         reason: InvalidNewState,
-        reject_state_propagation: Vec<PropagationResult<AE>>,
+        state_root: String,
+        propagation: Vec<PropagationResult<AE>>,
     },
 }
 
@@ -85,7 +85,7 @@ pub async fn tick<A: Adapter + 'static>(
     let approve_state_result = if let (Some(new_state), false) = (new_msg, latest_is_responded_to) {
         on_new_state(&iface, &balances, &new_state).await?
     } else {
-        ApproveStateResult::NotSent
+        ApproveStateResult::Sent(None)
     };
 
     Ok(TickStatus {
@@ -147,15 +147,15 @@ async fn on_new_state<'a, A: Adapter + 'static>(
         })])
         .await;
 
-    Ok(ApproveStateResult::Sent(propagation_result))
+    Ok(ApproveStateResult::Sent(Some(propagation_result)))
 }
 
 async fn on_error<'a, A: Adapter + 'static>(
     iface: &'a SentryApi<A>,
     new_state: &'a NewState,
     status: InvalidNewState,
 ) -> ApproveStateResult<A::AdapterError> {
-    let reject_state_propagation = iface
+    let propagation = iface
         .propagate(&[&MessageTypes::RejectState(RejectState {
             reason: status.to_string(),
             state_root: new_state.state_root.clone(),
@@ -168,6 +168,7 @@ async fn on_error<'a, A: Adapter + 'static>(
 
     ApproveStateResult::RejectedState {
         reason: status,
-        reject_state_propagation,
+        state_root: new_state.state_root.clone(),
+        propagation,
     }
 }

validator_worker/src/heartbeat.rs

@@ -5,18 +5,14 @@ use chrono::{Duration, Utc};
 
 use adapter::get_signable_state_root;
 use byteorder::{BigEndian, ByteOrder};
-use primitives::adapter::{Adapter, AdapterErrorKind};
+use primitives::adapter::Adapter;
 use primitives::merkle_tree::MerkleTree;
 use primitives::validator::{Heartbeat, MessageTypes};
 use primitives::{BalancesMap, BigNum, Channel};
 
 use crate::sentry_interface::{PropagationResult, SentryApi};
 
-#[derive(Debug)]
-pub enum HeartbeatStatus<AE: AdapterErrorKind> {
-    Sent(Vec<PropagationResult<AE>>),
-    NotSent,
-}
+pub type HeartbeatStatus<A> = Option<Vec<PropagationResult<A>>>;
 
 async fn send_heartbeat<A: Adapter + 'static>(
     iface: &SentryApi<A>,
@@ -59,9 +55,9 @@ pub async fn heartbeat<A: Adapter + 'static>(
     });
 
     if should_send {
-        Ok(HeartbeatStatus::Sent(send_heartbeat(&iface).await?))
+        Ok(Some(send_heartbeat(&iface).await?))
     } else {
-        Ok(HeartbeatStatus::NotSent)
+        Ok(None)
     }
 }
 

validator_worker/src/leader.rs

@@ -7,13 +7,6 @@ use crate::heartbeat::{heartbeat, HeartbeatStatus};
 use crate::sentry_interface::{PropagationResult, SentryApi};
 use crate::{get_state_root_hash, producer};
 
-#[derive(Debug)]
-pub enum NewStateResult<AE: AdapterErrorKind> {
-    Sent(Vec<PropagationResult<AE>>),
-    /// Conditions for sending the new state haven't been met
-    NotSent,
-}
-
 #[derive(Debug)]
 pub struct TickStatus<AE: AdapterErrorKind> {
     pub heartbeat: HeartbeatStatus<AE>,
@@ -27,10 +20,7 @@ pub async fn tick<A: Adapter + 'static>(
 ) -> Result<TickStatus<A::AdapterError>, Box<dyn Error>> {
     let producer_tick = producer::tick(&iface).await?;
     let (balances, new_state) = match &producer_tick {
-        producer::TickStatus::Sent {
-            new_accounting,
-            ..
-        } => {
+        producer::TickStatus::Sent { new_accounting, .. } => {
             let new_state = on_new_accounting(&iface, new_accounting).await?;
             (&new_accounting.balances, Some(new_state))
         }

validator_worker/src/producer.rs

@@ -13,7 +13,6 @@ use crate::sentry_interface::{PropagationResult, SentryApi};
 pub enum TickStatus<AE: AdapterErrorKind> {
     Sent {
         channel: ChannelId,
-        // balances: BalancesMap,
         new_accounting: Accounting,
         accounting_propagation: Vec<PropagationResult<AE>>,
         event_counts: usize,