use appropriate type when reading from the storage

Author: NicolasDP

jormungandr/src/blockchain_stuck_notifier.rs

@@ -10,14 +10,14 @@ use tokio::timer::Interval;
 pub fn check_last_block_time(
     service_info: TokioServiceInfo,
     blockchain_tip: blockchain::Tip,
-    check_interval: u64,
+    check_interval: Duration,
 ) -> impl Future<Item = (), Error = ()> {
     let logger = service_info.logger().clone();
     let err_logger = logger.clone();
 
     // those are different values, because check_interval can be big
     // (30 minutes) and the notification may remain unseen
-    let check_period = Duration::from_secs(check_interval);
+    let check_period = check_interval;
     let notification_period = Duration::from_secs(60);
 
     Interval::new_interval(notification_period)

jormungandr/src/settings/start/config.rs

@@ -32,7 +32,8 @@ pub struct Config {
     pub explorer: Option<Explorer>,
 
     /// the time interval with no blockchain updates after which alerts are thrown
-    pub no_blockchain_updates_warning_interval: Option<u64>,
+    #[serde(default)]
+    pub no_blockchain_updates_warning_interval: Option<Duration>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]

jormungandr/src/settings/start/mod.rs

@@ -35,7 +35,7 @@ pub struct Settings {
     pub mempool: Mempool,
     pub leadership: Leadership,
     pub explorer: bool,
-    pub no_blockchain_updates_warning_interval: u64,
+    pub no_blockchain_updates_warning_interval: std::time::Duration,
 }
 
 pub struct RawSettings {
@@ -177,8 +177,11 @@ impl RawSettings {
             explorer,
             no_blockchain_updates_warning_interval: config
                 .as_ref()
-                .and_then(|config| config.no_blockchain_updates_warning_interval)
-                .unwrap_or(DEFAULT_NO_BLOCKCHAIN_UPDATES_WARNING_INTERVAL),
+                .and_then(|config| config.no_blockchain_updates_warning_interval.clone())
+                .map(|d| d.into())
+                .unwrap_or(std::time::Duration::from_secs(
+                    DEFAULT_NO_BLOCKCHAIN_UPDATES_WARNING_INTERVAL,
+                )),
         })
     }
 }