Merge branch 'aip-61-adex-v5' into test_harness_analytics

Author: simzzz

primitives/src/validator.rs

@@ -330,15 +330,16 @@ pub mod messages {
         }
     }
 
-    #[derive(Default, Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+    #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
     #[serde(rename_all = "camelCase")]
     pub struct RejectState<S: BalancesState> {
         pub reason: String,
         pub state_root: String,
         pub signature: String,
         #[serde(flatten, bound = "S: BalancesState")]
         pub balances: Option<Balances<S>>,
-        pub timestamp: Option<DateTime<Utc>>,
+        /// The timestamp when the [`NewState`] was rejected.
+        pub timestamp: DateTime<Utc>,
     }
 
     #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]

validator_worker/src/follower.rs

@@ -321,8 +321,8 @@ async fn on_error<'a, C: Unlocked + 'static>(
                 state_root: new_state.state_root.clone(),
                 signature: new_state.signature.clone(),
                 balances: Some(new_state.balances.clone()),
-                /// The timestamp when the NewState is being rejected
-                timestamp: Some(Utc::now()),
+                // The timestamp when the NewState is being rejected
+                timestamp: Utc::now(),
             })],
         )
         .await?;
@@ -363,7 +363,7 @@ mod test {
         Mock, MockGuard, MockServer, ResponseTemplate,
     };
 
-    // Initialies a SentryApi instance
+    // Initializes a SentryApi instance
     async fn setup_sentry(server: &MockServer, config: &Config) -> SentryApi<Dummy> {
         let sentry_url =
             ApiUrl::from_str(&format!("{}/follower", &server.uri())).expect("Should parse");
@@ -978,7 +978,7 @@ mod test {
             let reject_state = RejectState {
                 state_root,
                 signature: IDS[&*FOLLOWER].to_checksum(),
-                timestamp: Some(received),
+                timestamp: received,
                 reason: "rejected".to_string(),
                 balances: None,
             };