Merge branch 'upgrade-jsonrpc-client'

2 files changed, 6 insertions, 7 deletions

diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 112fe26b82..4551b19b7f 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -37,7 +37,7 @@ mod shutdown;
 
 use error_chain::ChainedError;
 use futures::{BoxFuture, Future};
-use jsonrpc_client_http::{Error as HttpError, HttpHandle};
+use jsonrpc_client_http::HttpHandle;
 use jsonrpc_core::futures::sync::oneshot::Sender as OneshotSender;
 use management_interface::{ManagementInterfaceServer, TunnelCommand};
 use master::AccountsProxy;
@@ -160,7 +160,7 @@ struct Daemon {
     tx: mpsc::Sender<DaemonEvent>,
     management_interface_broadcaster: management_interface::EventBroadcaster,
     settings: settings::Settings,
-    accounts_proxy: AccountsProxy<HttpError, HttpHandle>,
+    accounts_proxy: AccountsProxy<HttpHandle>,
     firewall: FirewallProxy,
     remote_endpoint: Option<Endpoint>,
     tunnel_interface: Option<String>,
@@ -191,7 +191,7 @@ impl Daemon {
                 management_interface_broadcaster,
                 settings: settings::Settings::load().chain_err(|| "Unable to read settings")?,
                 accounts_proxy: master::create_account_proxy()
-                    .chain_err(|| "Unable to connect to master")?,
+                    .chain_err(|| "Unable to bootstrap RPC client")?,
                 firewall: FirewallProxy::new().chain_err(|| ErrorKind::FirewallError)?,
                 remote_endpoint: None,
                 tunnel_interface: None,
diff --git a/mullvad-daemon/src/master.rs b/mullvad-daemon/src/master.rs
index 96bf4778f2..37bfbe65e5 100644
--- a/mullvad-daemon/src/master.rs
+++ b/mullvad-daemon/src/master.rs
@@ -1,14 +1,13 @@
 use chrono::DateTime;
 use chrono::offset::Utc;
-use jsonrpc_client_http::{Error as HttpError, HttpCore, HttpHandle};
+use jsonrpc_client_http::{Error as HttpError, HttpHandle, HttpTransport};
 
 use mullvad_types::account::AccountToken;
 
 static MASTER_API_URI: &str = "https://api.mullvad.net/rpc/";
 
-pub fn create_account_proxy() -> Result<AccountsProxy<HttpError, HttpHandle>, HttpError> {
-    let core = HttpCore::standalone()?;
-    let transport = core.handle(MASTER_API_URI)?;
+pub fn create_account_proxy() -> Result<AccountsProxy<HttpHandle>, HttpError> {
+    let transport = HttpTransport::new()?.handle(MASTER_API_URI)?;
     Ok(AccountsProxy::new(transport))
 }