depolymerization

commit d92fd5cd2ceda19a66080ce1bf00a713ad15113f
parent c840884e01cc2a5ee76f5a96dd4b4deb6706af07
Author: Antoine A <>
Date:   Thu, 15 Sep 2022 15:20:12 +0200

fix timestamp (protocol change)

Diffstat:
M
common/src/api_common.rs
 | 
18
+++++++++---------

1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/common/src/api_common.rs b/common/src/api_common.rs
@@ -49,7 +49,7 @@ pub enum Timestamp {
 
 #[derive(serde::Serialize, serde::Deserialize)]
 struct TimestampImpl {
-    t_ms: Value,
+    t_s: Value,
 }
 
 impl Timestamp {
@@ -64,18 +64,18 @@ impl<'de> Deserialize<'de> for Timestamp {
         D: Deserializer<'de>,
     {
         let tmp = TimestampImpl::deserialize(deserializer)?;
-        match tmp.t_ms {
-            Value::Number(ms) => {
-                if let Some(since_epoch_ms) = ms.as_u64() {
+        match tmp.t_s {
+            Value::Number(s) => {
+                if let Some(since_epoch_s) = s.as_u64() {
                     Ok(Self::Time(
-                        SystemTime::UNIX_EPOCH + Duration::from_millis(since_epoch_ms),
+                        SystemTime::UNIX_EPOCH + Duration::from_secs(since_epoch_s),
                     ))
                 } else {
-                    Err(Error::custom("Expected epoch time millis"))
+                    Err(Error::custom("Expected epoch time"))
                 }
             }
             Value::String(str) if str == "never" => Ok(Self::Never),
-            _ => Err(Error::custom("Expected epoch time millis or 'never'")),
+            _ => Err(Error::custom("Expected epoch time or 'never'")),
         }
     }
 }
@@ -90,10 +90,10 @@ impl serde::Serialize for Timestamp {
             Timestamp::Never => se_struct.serialize_field("t_s", "never")?,
             Timestamp::Time(time) => se_struct.serialize_field(
                 "t_s",
-                &(time
+                &time
                     .duration_since(SystemTime::UNIX_EPOCH)
                     .unwrap()
-                    .as_secs() as u128),
+                    .as_secs(),
             )?,
         };