Remove key rotation interval calculation from management interface

2 files changed, 5 insertions, 5 deletions

diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index cf5a6cb2dd..61df804d3e 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -1,6 +1,4 @@
-use crate::{
-    wireguard::DEFAULT_AUTOMATIC_KEY_ROTATION, DaemonCommand, DaemonCommandSender, EventListener,
-};
+use crate::{DaemonCommand, DaemonCommandSender, EventListener};
 use futures::compat::Future01CompatExt;
 use futures01::{future, sync, Future};
 use mullvad_management_interface::{
@@ -1199,6 +1197,8 @@ fn convert_bridge_state(state: &BridgeState) -> types::BridgeState {
 }
 
 fn convert_tunnel_options(options: &TunnelOptions) -> types::TunnelOptions {
+    use types::tunnel_options::wireguard_options::RotationInterval;
+
     types::TunnelOptions {
         openvpn: Some(types::tunnel_options::OpenvpnOptions {
             mssfix: u32::from(options.openvpn.mssfix.unwrap_or_default()),
@@ -1208,7 +1208,7 @@ fn convert_tunnel_options(options: &TunnelOptions) -> types::TunnelOptions {
             automatic_rotation: options
                 .wireguard
                 .automatic_rotation
-                .unwrap_or((DEFAULT_AUTOMATIC_KEY_ROTATION.as_secs() / 60u64 / 60u64) as u32),
+                .map(|interval| RotationInterval { interval }),
         }),
         generic: Some(types::tunnel_options::GenericOptions {
             enable_ipv6: options.generic.enable_ipv6,
diff --git a/mullvad-daemon/src/wireguard.rs b/mullvad-daemon/src/wireguard.rs
index 58daf58ca5..2ebd5fae50 100644
--- a/mullvad-daemon/src/wireguard.rs
+++ b/mullvad-daemon/src/wireguard.rs
@@ -22,7 +22,7 @@ use talpid_types::ErrorExt;
 use tokio_timer;
 
 /// Default automatic key rotation
-pub const DEFAULT_AUTOMATIC_KEY_ROTATION: Duration = Duration::from_secs(7 * 24 * 60 * 60);
+const DEFAULT_AUTOMATIC_KEY_ROTATION: Duration = Duration::from_secs(7 * 24 * 60 * 60);
 /// How long to wait before reattempting to rotate keys on failure
 const AUTOMATIC_ROTATION_RETRY_DELAY: Duration = Duration::from_secs(60 * 15);
 /// How often to check whether the key has expired.