Move the Mullvad Settings type to mullvad_types

6 files changed, 14 insertions, 6 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 05ff2b7f7c..3957e59b62 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1039,8 +1039,10 @@ dependencies = [
  "chrono 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mullvad-paths 0.1.0",
  "serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "talpid-types 0.1.0",
 ]
 
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 1b1297bdc0..b4b1f465a8 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -51,7 +51,6 @@ mod logging;
 mod management_interface;
 mod relays;
 mod rpc_uniqueness_check;
-mod settings;
 mod shutdown;
 mod system_service;
 mod version;
@@ -68,6 +67,7 @@ use mullvad_types::account::{AccountData, AccountToken};
 use mullvad_types::location::GeoIpLocation;
 use mullvad_types::relay_constraints::{RelaySettings, RelaySettingsUpdate};
 use mullvad_types::relay_list::{Relay, RelayList};
+use mullvad_types::settings::Settings;
 use mullvad_types::states::TargetState;
 use mullvad_types::version::{AppVersion, AppVersionInfo};
 
@@ -185,7 +185,7 @@ struct Daemon {
     rx: mpsc::Receiver<DaemonEvent>,
     tx: mpsc::Sender<DaemonEvent>,
     management_interface_broadcaster: management_interface::EventBroadcaster,
-    settings: settings::Settings,
+    settings: Settings,
     accounts_proxy: AccountsProxy<HttpHandle>,
     version_proxy: AppVersionProxy<HttpHandle>,
     https_handle: mullvad_rpc::rest::RequestSender,
@@ -243,7 +243,7 @@ impl Daemon {
             rx,
             tx,
             management_interface_broadcaster,
-            settings: settings::Settings::load().chain_err(|| "Unable to read settings")?,
+            settings: Settings::load().chain_err(|| "Unable to read settings")?,
             accounts_proxy: AccountsProxy::new(rpc_handle.clone()),
             version_proxy: AppVersionProxy::new(rpc_handle),
             https_handle,
@@ -570,7 +570,7 @@ impl Daemon {
         Self::oneshot_send(tx, tunnel_options, "get_tunnel_options response");
     }
 
-    fn on_get_settings(&self, tx: OneshotSender<settings::Settings>) {
+    fn on_get_settings(&self, tx: OneshotSender<Settings>) {
         Self::oneshot_send(tx, self.settings.clone(), "get_settings response");
     }
 
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index 4039136299..2e534baf52 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -12,11 +12,11 @@ use mullvad_types::location::GeoIpLocation;
 use mullvad_paths;
 use mullvad_types::relay_constraints::{RelaySettings, RelaySettingsUpdate};
 use mullvad_types::relay_list::RelayList;
+use mullvad_types::settings::Settings;
 use mullvad_types::states::TargetState;
 use mullvad_types::version;
 
 use serde;
-use settings::Settings;
 
 use std::collections::hash_map::Entry;
 use std::collections::HashMap;
diff --git a/mullvad-types/Cargo.toml b/mullvad-types/Cargo.toml
index 1076d22b17..9b617d257a 100644
--- a/mullvad-types/Cargo.toml
+++ b/mullvad-types/Cargo.toml
@@ -9,7 +9,9 @@ license = "GPL-3.0"
 chrono = { version = "0.4", features = ["serde"] }
 serde_derive = "1.0"
 serde = "1.0"
+serde_json = "1.0"
 error-chain = "0.12"
 log = "0.4"
 
 talpid-types = { path = "../talpid-types" }
+mullvad-paths = { path = "../mullvad-paths" }
diff --git a/mullvad-types/src/lib.rs b/mullvad-types/src/lib.rs
index 6cae36372d..ff7628b9ad 100644
--- a/mullvad-types/src/lib.rs
+++ b/mullvad-types/src/lib.rs
@@ -11,6 +11,7 @@ extern crate serde;
 #[macro_use]
 extern crate serde_derive;
 
+extern crate mullvad_paths;
 extern crate talpid_types;
 
 #[macro_use]
@@ -23,6 +24,7 @@ pub mod account;
 pub mod location;
 pub mod relay_constraints;
 pub mod relay_list;
+pub mod settings;
 pub mod states;
 pub mod version;
 
diff --git a/mullvad-daemon/src/settings.rs b/mullvad-types/src/settings.rs
index 216d18f4d8..231a1b638d 100644
--- a/mullvad-daemon/src/settings.rs
+++ b/mullvad-types/src/settings.rs
@@ -1,6 +1,6 @@
 extern crate serde_json;
 
-use mullvad_types::relay_constraints::{
+use relay_constraints::{
     Constraint, LocationConstraint, RelayConstraints, RelaySettings, RelaySettingsUpdate,
 };
 use talpid_types::net::TunnelOptions;
@@ -30,6 +30,8 @@ error_chain! {
 
 static SETTINGS_FILE: &str = "settings.json";
 
+
+/// Mullvad daemon settings.
 #[derive(Debug, Clone, Deserialize, Serialize)]
 #[serde(default)]
 pub struct Settings {