Merge branch 'dev' into issue-202-anyone-to-withdraw

Author: elpiel

Cargo.lock

@@ -1,8 +1,7 @@
-use chrono::serde::ts_milliseconds;
+use chrono::serde::{ts_milliseconds, ts_milliseconds_option};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-use crate::util::serde::ts_milliseconds_option;
 use crate::TargetingTag;
 
 #[derive(Serialize, Deserialize, Debug, Clone)]

primitives/src/ad_unit.rs

@@ -1,13 +1,12 @@
 use std::error::Error;
 use std::fmt;
 
-use chrono::serde::{ts_milliseconds, ts_seconds};
+use chrono::serde::{ts_milliseconds, ts_milliseconds_option, ts_seconds};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use serde_hex::{SerHex, StrictPfx};
 
 use crate::big_num::BigNum;
-use crate::util::serde::ts_milliseconds_option;
 use crate::{AdUnit, EventSubmission, TargetingTag, ValidatorDesc, ValidatorId};
 use hex::{FromHex, FromHexError};
 use std::ops::Deref;

primitives/src/channel.rs

@@ -22,7 +22,6 @@ pub mod util {
     }
 
     pub mod logging;
-    pub mod serde;
 }
 pub mod validator;