Simplify returned value for SetTargetState

2 files changed, 7 insertions, 20 deletions

diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index 10ed53171f..e159e33be7 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -143,7 +143,7 @@ pub enum Error {
 /// Enum representing commands that can be sent to the daemon.
 pub enum DaemonCommand {
     /// Set target state. Does nothing if the daemon already has the state that is being set.
-    SetTargetState(oneshot::Sender<Result<(), ()>>, TargetState),
+    SetTargetState(oneshot::Sender<()>, TargetState),
     /// Reconnect the tunnel, if one is connecting/connected.
     Reconnect,
     /// Request the current state.
@@ -189,15 +189,9 @@ pub enum DaemonCommand {
     /// Set the mssfix argument for OpenVPN
     SetOpenVpnMssfix(oneshot::Sender<()>, Option<u16>),
     /// Set proxy details for OpenVPN
-    SetBridgeSettings(
-        oneshot::Sender<std::result::Result<(), settings::Error>>,
-        BridgeSettings,
-    ),
+    SetBridgeSettings(oneshot::Sender<Result<(), settings::Error>>, BridgeSettings),
     /// Set proxy state
-    SetBridgeState(
-        oneshot::Sender<std::result::Result<(), settings::Error>>,
-        BridgeState,
-    ),
+    SetBridgeState(oneshot::Sender<Result<(), settings::Error>>, BridgeState),
     /// Set if IPv6 should be enabled in the tunnel
     SetEnableIpv6(oneshot::Sender<()>, bool),
     /// Set MTU for wireguard tunnels
@@ -1144,17 +1138,13 @@ where
         self.event_listener.notify_app_version(app_version_info);
     }
 
-    fn on_set_target_state(
-        &mut self,
-        tx: oneshot::Sender<Result<(), ()>>,
-        new_target_state: TargetState,
-    ) {
+    fn on_set_target_state(&mut self, tx: oneshot::Sender<()>, new_target_state: TargetState) {
         if self.state.is_running() {
             self.set_target_state(new_target_state);
         } else {
             warn!("Ignoring target state change request due to shutdown");
         }
-        Self::oneshot_send(tx, Ok(()), "target state");
+        Self::oneshot_send(tx, (), "target state");
     }
 
     fn on_reconnect(&mut self) {
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index 03df64d51f..cba6e96b43 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -65,11 +65,8 @@ impl ManagementService for ManagementServiceImpl {
 
         let (tx, rx) = oneshot::channel();
         self.send_command_to_daemon(DaemonCommand::SetTargetState(tx, TargetState::Secured))?;
-        let result = rx.await.map_err(|_| Status::internal("internal error"))?;
-        match result {
-            Ok(()) => Ok(Response::new(())),
-            Err(()) => Err(Status::new(Code::from(-900), "No account token configured")),
-        }
+        rx.await.map_err(|_| Status::internal("internal error"))?;
+        Ok(Response::new(()))
     }
 
     async fn disconnect_tunnel(&self, _: Request<()>) -> ServiceResult<()> {