targeting - input - Change timestamp from u64 to DateTime

Author: elpiel

primitives/src/channel.rs

@@ -348,18 +348,21 @@ mod test {
         let prefixed_value = serde_json::Value::String(prefixed_string.clone());
 
         // Deserialization from JSON
-        let de_hex_json = serde_json::from_value::<ChannelId>(hex_value.clone())
+        let de_hex_json =
+            serde_json::from_value::<ChannelId>(hex_value.clone()).expect("Should deserialize");
+        let de_prefixed_json = serde_json::from_value::<ChannelId>(prefixed_value.clone())
             .expect("Should deserialize");
-        let de_prefixed_json =
-            serde_json::from_value::<ChannelId>(prefixed_value.clone()).expect("Should deserialize");
 
         assert_eq!(de_hex_json, expected_id);
         assert_eq!(de_prefixed_json, expected_id);
 
         // Serialization to JSON
         let actual_serialized = serde_json::to_value(expected_id).expect("Should Serialize");
         // we don't expect any capitalization
-        assert_eq!(actual_serialized, serde_json::Value::String(prefixed_string))
+        assert_eq!(
+            actual_serialized,
+            serde_json::Value::String(prefixed_string)
+        )
     }
 }
 

primitives/src/targeting/eval_test.rs

@@ -1,3 +1,5 @@
+use chrono::{TimeZone, Utc};
+
 use super::*;
 use crate::{
     targeting::input,
@@ -20,7 +22,7 @@ fn get_default_input() -> Input {
             publisher_id: IDS["leader"],
             country: Some("bg".to_string()),
             event_type: "IMPRESSION".to_string(),
-            seconds_since_epoch: 500,
+            seconds_since_epoch: Utc.ymd(2020, 11, 06).and_hms(12, 0, 0),
             user_agent_os: Some("os".to_string()),
             user_agent_browser_family: Some("family".to_string()),
         },

primitives/src/targeting/input.rs

@@ -1,5 +1,6 @@
 use super::{Error, Value};
 use crate::{ToETHChecksum, ValidatorId, IPFS};
+use chrono::{serde::ts_seconds, DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
 use field::{Field, GetField};
@@ -148,7 +149,8 @@ pub struct Global {
     pub publisher_id: ValidatorId,
     pub country: Option<String>,
     pub event_type: String,
-    pub seconds_since_epoch: u64,
+    #[serde(with = "ts_seconds")]
+    pub seconds_since_epoch: DateTime<Utc>,
     #[serde(rename = "userAgentOS")]
     pub user_agent_os: Option<String>,
     pub user_agent_browser_family: Option<String>,
@@ -166,7 +168,8 @@ impl GetField for Global {
             field::Global::Country => self.country.clone().map(Value::String),
             field::Global::EventType => Some(Value::String(self.event_type.clone())),
             field::Global::SecondsSinceEpoch => {
-                Some(Value::Number(self.seconds_since_epoch.into()))
+                // no need to convert to u64, this value should always be positive
+                Some(Value::new_number(self.seconds_since_epoch.timestamp()))
             }
             field::Global::UserAgentOS => self.user_agent_os.clone().map(Value::String),
             field::Global::UserAgentBrowserFamily => {
@@ -480,7 +483,7 @@ mod test {
                 publisher_id: IDS["publisher"],
                 country: Some("BG".into()),
                 event_type: "IMPRESSION".into(),
-                seconds_since_epoch: actual_date.timestamp() as u64,
+                seconds_since_epoch: actual_date,
                 user_agent_os: Some("Ubuntu".into()),
                 user_agent_browser_family: Some("Firefox".into()),
             },

sentry/src/payout.rs

@@ -7,10 +7,7 @@ use primitives::{
     BigNum, Channel, ValidatorId,
 };
 use slog::{error, Logger};
-use std::{
-    cmp::{max, min},
-    convert::TryFrom,
-};
+use std::cmp::{max, min};
 
 type Result = std::result::Result<Option<(ValidatorId, BigNum)>, Error>;
 
@@ -59,10 +56,7 @@ pub fn get_payout(logger: &Logger, channel: &Channel, event: &Event, session: &S
                         publisher_id: *publisher,
                         country: session.country.clone(),
                         event_type: event_type.clone(),
-                        // **seconds** means calling `timestamp()`
-                        seconds_since_epoch: u64::try_from(Utc::now().timestamp()).expect(
-                            "The timestamp (i64) should not overflow or underflow the u64!",
-                        ),
+                        seconds_since_epoch: Utc::now(),
                         user_agent_os: session.os.clone(),
                         user_agent_browser_family: None,
                     },