Expunge more uses of time >0.3.2 API (#1050)

* Remove more de-facto uses of time >0.3.2 API

* Test Add and Sub impls for Time

rpc/src/query.rs

@@ -281,7 +281,7 @@ peg::parser! {
 
         rule date_op() -> Operand
             = "DATE" __ dt:date() {?
-                let date = Date::parse(dt, format_description!("[year]-[month]-[day]"))
+                let date = Date::parse(dt, &format_description!("[year]-[month]-[day]"))
                     .map_err(|_| "failed to parse as RFC3339-compatible date")?;
                 Ok(Operand::Date(date))
             }

tendermint/src/time.rs

@@ -146,25 +146,39 @@ impl Add<Duration> for Time {
     type Output = Result<Self, Error>;
 
     fn add(self, rhs: Duration) -> Self::Output {
-        let duration = rhs.try_into().map_err(|_| Error::duration_out_of_range())?;
-        let t = self
-            .0
-            .checked_add(duration)
+        // Work around not being able to depend on time 0.3.5
+        // https://github.com/informalsystems/tendermint-rs/issues/1047
+        let lhs_nanos = self.0.assume_utc().unix_timestamp_nanos();
+        let rhs_nanos: i128 = rhs
+            .as_nanos()
+            .try_into()
+            .map_err(|_| Error::duration_out_of_range())?;
+        let res_nanos = lhs_nanos
+            .checked_add(rhs_nanos)
             .ok_or_else(Error::duration_out_of_range)?;
-        Self::from_utc(t.assume_utc())
+        let t = OffsetDateTime::from_unix_timestamp_nanos(res_nanos)
+            .map_err(|_| Error::duration_out_of_range())?;
+        Self::from_utc(t)
     }
 }
 
 impl Sub<Duration> for Time {
     type Output = Result<Self, Error>;
 
     fn sub(self, rhs: Duration) -> Self::Output {
-        let duration = rhs.try_into().map_err(|_| Error::duration_out_of_range())?;
-        let t = self
-            .0
-            .checked_sub(duration)
+        // Work around not being able to depend on time 0.3.5
+        // https://github.com/informalsystems/tendermint-rs/issues/1047
+        let lhs_nanos = self.0.assume_utc().unix_timestamp_nanos();
+        let rhs_nanos: i128 = rhs
+            .as_nanos()
+            .try_into()
+            .map_err(|_| Error::duration_out_of_range())?;
+        let res_nanos = lhs_nanos
+            .checked_sub(rhs_nanos)
             .ok_or_else(Error::duration_out_of_range)?;
-        Self::from_utc(t.assume_utc())
+        let t = OffsetDateTime::from_unix_timestamp_nanos(res_nanos)
+            .map_err(|_| Error::duration_out_of_range())?;
+        Self::from_utc(t)
     }
 }
 
@@ -292,7 +306,6 @@ mod tests {
         }
     }
 
-    #[allow(dead_code)]
     fn duration_from_nanos(whole_nanos: u128) -> Duration {
         let secs: u64 = (whole_nanos / 1_000_000_000).try_into().unwrap();
         let nanos = (whole_nanos % 1_000_000_000) as u32;
@@ -355,5 +368,33 @@ mod tests {
             }
     }
 
-    // TODO: add tests for additive ops using the strategies above
+    proptest! {
+        #[test]
+        fn add_regular((dt, d) in args_for_regular_add()) {
+            let t: Time = dt.try_into().unwrap();
+            let t = (t + d).unwrap();
+            let res: OffsetDateTime = t.into();
+            assert_eq!(res, dt + d);
+        }
+
+        #[test]
+        fn sub_regular((dt, d) in args_for_regular_sub()) {
+            let t: Time = dt.try_into().unwrap();
+            let t = (t - d).unwrap();
+            let res: OffsetDateTime = t.into();
+            assert_eq!(res, dt - d);
+        }
+
+        #[test]
+        fn add_overflow((dt, d) in args_for_overflowed_add()) {
+            let t: Time = dt.try_into().unwrap();
+            assert!((t + d).is_err());
+        }
+
+        #[test]
+        fn sub_overflow((dt, d) in args_for_overflowed_sub()) {
+            let t: Time = dt.try_into().unwrap();
+            assert!((t - d).is_err());
+        }
+    }
 }