Import OneshotSender

2 files changed, 8 insertions, 7 deletions

diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 3479a231a1..03c6f55d22 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -31,7 +31,7 @@ mod settings;
 mod shutdown;
 
 use error_chain::ChainedError;
-use jsonrpc_core::futures::sync;
+use jsonrpc_core::futures::sync::oneshot::Sender as OneshotSender;
 use management_interface::{ManagementInterfaceServer, TunnelCommand};
 use mullvad_types::states::{DaemonState, SecurityState, TargetState};
 use std::io;
@@ -294,14 +294,14 @@ impl Daemon {
         }
     }
 
-    fn on_get_state(&self, tx: sync::oneshot::Sender<DaemonState>) {
+    fn on_get_state(&self, tx: OneshotSender<DaemonState>) {
         if let Err(_) = tx.send(self.last_broadcasted_state) {
             warn!("Unable to send current state to management interface client",);
         }
     }
 
     fn on_set_account(&mut self,
-                      tx: sync::oneshot::Sender<()>,
+                      tx: OneshotSender<()>,
                       account_token: Option<String>)
                       -> Result<()> {
 
@@ -325,7 +325,7 @@ impl Daemon {
         Ok(())
     }
 
-    fn on_get_account(&self, tx: sync::oneshot::Sender<Option<String>>) {
+    fn on_get_account(&self, tx: OneshotSender<Option<String>>) {
         if let Err(_) = tx.send(self.settings.get_account_token()) {
             warn!("Unable to send current account to management interface client");
         }
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index 59f2035d41..d89c5f6024 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -2,6 +2,7 @@ use error_chain;
 
 use jsonrpc_core::{Error, ErrorCode, Metadata};
 use jsonrpc_core::futures::{BoxFuture, Future, future, sync};
+use jsonrpc_core::futures::sync::oneshot::Sender as OneshotSender;
 use jsonrpc_macros::pubsub;
 use jsonrpc_pubsub::{PubSubHandler, PubSubMetadata, Session, SubscriptionId};
 use jsonrpc_ws_server;
@@ -102,11 +103,11 @@ pub enum TunnelCommand {
     /// Change target state.
     SetTargetState(TargetState),
     /// Request the current state.
-    GetState(sync::oneshot::Sender<DaemonState>),
+    GetState(OneshotSender<DaemonState>),
     /// Set which account token to use for subsequent connection attempts.
-    SetAccount(sync::oneshot::Sender<()>, Option<AccountToken>),
+    SetAccount(OneshotSender<()>, Option<AccountToken>),
     /// Request the current account token being used.
-    GetAccount(sync::oneshot::Sender<Option<AccountToken>>),
+    GetAccount(OneshotSender<Option<AccountToken>>),
 }
 
 #[derive(Default)]