Adapt to intermediate solution

3 files changed, 10 insertions, 12 deletions

diff --git a/Cargo.lock b/Cargo.lock
index d54055a31e..717f93bddc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -702,6 +702,7 @@ dependencies = [
  "jsonrpc-client-core 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-client-http 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "mullvad-types 0.1.0",
+ "serde_json 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index d4de632817..1619205669 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -48,10 +48,10 @@ use futures::Future;
 use jsonrpc_core::futures::sync::oneshot::Sender as OneshotSender;
 use management_interface::{BoxFuture, ManagementInterfaceServer, TunnelCommand};
 use mullvad_rpc::{AccountsProxy, HttpHandle};
+use mullvad_types::CustomTunnelEndpoint;
 use mullvad_types::account::{AccountData, AccountToken};
 use mullvad_types::relay_constraints::{Constraint, OpenVpnConstraints, RelayConstraints,
                                        RelayConstraintsUpdate, TunnelConstraints};
-use mullvad_types::relay_endpoint::RelayEndpoint;
 use mullvad_types::states::{DaemonState, SecurityState, TargetState};
 
 use rand::Rng;
@@ -561,16 +561,11 @@ impl Daemon {
             Constraint::Only(port) => port,
         };
 
-        let endpoint = RelayEndpoint {
+        CustomTunnelEndpoint {
             host,
-            port,
-            protocol,
-        }.to_endpoint()
-            .chain_err(|| "Unable to construct a valid relay")?;
-        Ok(TunnelEndpoint {
-            address: endpoint.address.ip(),
             tunnel: TunnelParameters::OpenVpn(OpenVpnParameters { port, protocol }),
-        })
+        }.to_tunnel_endpoint()
+            .chain_err(|| "Unable to construct a valid relay")
     }
 
     fn spawn_tunnel_monitor(
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index 28b905390d..a71dddfb35 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -449,9 +449,11 @@ impl<T: From<TunnelCommand> + 'static + Send> ManagementInterfaceApi for Managem
     fn get_location(&self) -> Result<Location, Error> {
         trace!("get_location");
         Ok(Location {
-            latlong: [1.0, 2.0],
-            country: "narnia".to_owned(),
-            city: "Le city".to_owned(),
+            country: String::from("narnia"),
+            country_code: String::from("na"),
+            city: String::from("Le city"),
+            city_code: String::from("le"),
+            position: [1.0, 2.0],
         })
     }