fix: LastApproved type

Author: samparsky

primitives/src/sentry.rs

@@ -1,4 +1,4 @@
-use crate::validator::{Heartbeat, MessageTypes};
+use crate::validator::{ApproveState, Heartbeat, MessageTypes, NewState};
 use crate::{BigNum, Channel};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
@@ -9,9 +9,23 @@ use std::collections::HashMap;
 #[serde(rename_all = "camelCase")]
 pub struct LastApproved {
     /// NewState can be None if the channel is brand new
-    pub new_state: Option<ValidatorMessage>,
+    pub new_state: Option<NewStateValidatorMessage>,
     /// ApproveState can be None if the channel is brand new
-    pub approved_state: Option<ValidatorMessage>,
+    pub approved_state: Option<ApproveStateValidatorMessage>,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct NewStateValidatorMessage {
+    pub from: String,
+    pub received: DateTime<Utc>,
+    pub msg: NewState,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct ApproveStateValidatorMessage {
+    pub from: String,
+    pub received: DateTime<Utc>,
+    pub msg: ApproveState,
 }
 
 #[serde(tag = "type", rename_all = "SCREAMING_SNAKE_CASE")]

validator_worker/src/follower.rs

@@ -80,10 +80,7 @@ async fn on_new_state<'a, A: Adapter + 'static>(
     let prev_balances = last_approve_response
         .last_approved
         .and_then(|last_approved| last_approved.new_state)
-        .map_or(Default::default(), |new_state| match new_state.msg {
-            MessageTypes::NewState(state) => state.balances,
-            _ => Default::default(),
-        });
+        .map_or(Default::default(), |new_state| new_state.msg.balances);
 
     if !is_valid_transition(&iface.channel, &prev_balances, &proposed_balances) {
         drop(adapter);