Fix out of range bug

Valid hours are only 0-23, which means we need to roll over to the next day.

daemon/src/maker_cfd.rs

@@ -175,7 +175,7 @@ impl Actor {
         max_quantity: Usd,
     ) -> Result<()> {
         let oracle_event_id =
-            oracle::next_announcement_after(time::OffsetDateTime::now_utc() + Order::TERM);
+            oracle::next_announcement_after(time::OffsetDateTime::now_utc() + Order::TERM)?;
 
         let order = Order::new(
             price,
@@ -691,7 +691,7 @@ impl Actor {
         // TODO: do we want to store in the db that we rolled over?
 
         let oracle_event_id =
-            oracle::next_announcement_after(time::OffsetDateTime::now_utc() + Order::TERM);
+            oracle::next_announcement_after(time::OffsetDateTime::now_utc() + Order::TERM)?;
         let announcement = self
             .oracle_actor
             .send(oracle::GetAnnouncement(oracle_event_id.clone()))

daemon/src/oracle.rs

@@ -12,6 +12,8 @@ use rocket::time::macros::format_description;
 use rocket::time::{Duration, OffsetDateTime, Time};
 use serde::{Deserialize, Serialize};
 use std::collections::{HashMap, HashSet};
+use std::ops::Add;
+use time::ext::NumericalDuration;
 
 const OLIVIA_EVENT_TIME_FORMAT: &[FormatItem] =
     format_description!("[year]-[month]-[day]T[hour]:[minute]:[second]");
@@ -236,12 +238,17 @@ fn next_24_hours(datetime: OffsetDateTime) -> Vec<OffsetDateTime> {
 }
 
 #[allow(dead_code)]
-pub fn next_announcement_after(timestamp: OffsetDateTime) -> OracleEventId {
+pub fn next_announcement_after(timestamp: OffsetDateTime) -> Result<OracleEventId> {
-    // always ceil to next hour
+    // always ceil to next hour and roll over to next day automatically
-    let adjusted =
-        timestamp.replace_time(Time::from_hms(timestamp.hour() + 1, 0, 0).expect("in_range"));
 
-    event_id(adjusted)
+    let timestamp = timestamp.add(1.hours());
+
+    let adjusted = timestamp.replace_time(
+        Time::from_hms(timestamp.hour(), 0, 0)
+            .context("Could not adjust time for next announcement")?,
+    );
+
+    Ok(event_id(adjusted))
 }
 
 /// Construct the URL of `olivia`'s `BitMEX/BXBT` event to be attested
@@ -575,11 +582,20 @@ mod tests {
 
     #[test]
     fn next_event_id_after_timestamp() {
-        let event_id = next_announcement_after(datetime!(2021-09-23 10:40:00).assume_utc());
+        let event_id =
+            next_announcement_after(datetime!(2021-09-23 10:40:00).assume_utc()).unwrap();
 
         assert_eq!(event_id.0, "/x/BitMEX/BXBT/2021-09-23T11:00:00.price?n=20");
     }
 
+    #[test]
+    fn next_event_id_is_midnight_next_day() {
+        let event_id =
+            next_announcement_after(datetime!(2021-09-23 23:40:00).assume_utc()).unwrap();
+
+        assert_eq!(event_id.0, "/x/BitMEX/BXBT/2021-09-24T00:00:00.price?n=20");
+    }
+
     #[test]
     fn next_24() {
         let datetime = datetime!(2021-09-23 10:43:12);