fix: last approved response

Author: samparsky

README.md

@@ -45,6 +45,11 @@ you need to be running those in order to run the automated tests:
 
 TODO
 
+### Bug
+
+
+
+
 ### Run Validator Worker
 
 TODO

primitives/src/sentry.rs

@@ -6,6 +6,7 @@ use std::collections::HashMap;
 use std::fmt;
 use std::hash::Hash;
 
+
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct LastApproved {
@@ -19,21 +20,21 @@ pub struct LastApproved {
 pub struct NewStateValidatorMessage {
     pub from: String,
     pub received: DateTime<Utc>,
-    pub msg: NewState,
+    pub msg: MessageTypes,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct ApproveStateValidatorMessage {
     pub from: String,
     pub received: DateTime<Utc>,
-    pub msg: ApproveState,
+    pub msg: MessageTypes,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct HeartbeatValidatorMessage {
     pub from: String,
     pub received: DateTime<Utc>,
-    pub msg: Heartbeat,
+    pub msg: MessageTypes,
 }
 
 #[serde(tag = "type", rename_all = "SCREAMING_SNAKE_CASE")]
@@ -245,7 +246,7 @@ mod postgres {
             Self {
                 from: row.get("from"),
                 received: row.get("received"),
-                msg: row.get::<_, Json<ApproveState>>("msg").0,
+                msg: row.get::<_, Json<MessageTypes>>("msg").0,
             }
         }
     }
@@ -255,7 +256,7 @@ mod postgres {
             Self {
                 from: row.get("from"),
                 received: row.get("received"),
-                msg: row.get::<_, Json<NewState>>("msg").0,
+                msg: row.get::<_, Json<MessageTypes>>("msg").0,
             }
         }
     }
@@ -265,7 +266,7 @@ mod postgres {
             Self {
                 from: row.get("from"),
                 received: row.get("received"),
-                msg: row.get::<_, Json<Heartbeat>>("msg").0,
+                msg: row.get::<_, Json<MessageTypes>>("msg").0,
             }
         }
     }

sentry/src/routes/channel.rs

@@ -117,12 +117,11 @@ pub async fn last_approved<A: Adapter>(
             .unwrap());
     }
 
-    let state_root = approve_state
-        .as_ref()
-        .expect("value should be present")
-        .msg
-        .state_root
-        .clone();
+    let state_root = match approve_state.as_ref().expect("value should be present").msg.clone() {
+        MessageTypes::ApproveState(approve_state) => approve_state.state_root,
+        _ => return Err(ResponseError::BadRequest("invalid request".to_string()))
+    };
+
     let new_state = latest_new_state(&app.pool, &channel, &state_root).await?;
     if new_state.is_none() {
         return Ok(Response::builder()

validator.env.dist

@@ -3,4 +3,6 @@ ADAPTER=dummy
 DUMMY_IDENTITY=ce07CbB7e054514D590a0262C93070D838bFBA2e
 # for Ethereum adapter
 #KEYSTORE_FILE="/app/keystore.json"
-#KEYSTORE_PWD="adexvalidator"
+#KEYSTORE_PWD="adexvalidator"
+
+