fix: validator messages type

Author: samparsky

primitives/src/sentry.rs

@@ -1,4 +1,4 @@
-use crate::validator::{ApproveState, Heartbeat, MessageTypes, NewState};
+use crate::validator::MessageTypes;
 use crate::{BigNum, Channel, ChannelId, ValidatorId};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
@@ -214,7 +214,7 @@ mod postgres {
         ValidatorMessage,
     };
     use crate::sentry::EventAggregate;
-    use crate::validator::{ApproveState, Heartbeat, MessageTypes, NewState};
+    use crate::validator::MessageTypes;
     use bytes::BytesMut;
     use postgres_types::{accepts, to_sql_checked, IsNull, Json, ToSql, Type};
     use std::error::Error;

validator_worker/src/follower.rs

@@ -72,10 +72,17 @@ async fn on_new_state<'a, A: Adapter + 'static>(
     }
 
     let last_approve_response = iface.get_last_approved().await?;
-    let prev_balances = last_approve_response
+    let prev_balances = match last_approve_response
         .last_approved
         .and_then(|last_approved| last_approved.new_state)
-        .map_or(Default::default(), |new_state| new_state.msg.balances);
+    {
+        Some(new_state) => match new_state.msg {
+            MessageTypes::NewState(new_state) => new_state.balances,
+            _ => Default::default(),
+        },
+        _ => Default::default(),
+    };
+    // .map_or(Default::default(), |new_state| new_state.msg.balances);
 
     if !is_valid_transition(&iface.channel, &prev_balances, &proposed_balances) {
         return Ok(on_error(&iface, &new_state, InvalidNewState::Transition).await);