Make async fns without awaits into regular fns

3 files changed, 10 insertions, 11 deletions

diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index 3ea3cdbd27..4bb22a9aa8 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -856,8 +856,7 @@ where
         &mut self,
         tunnel_state_transition: TunnelStateTransition,
     ) {
-        self.reset_rpc_sockets_on_tunnel_state_transition(&tunnel_state_transition)
-            .await;
+        self.reset_rpc_sockets_on_tunnel_state_transition(&tunnel_state_transition);
         self.device_checker
             .handle_state_transition(&tunnel_state_transition);
 
@@ -923,12 +922,12 @@ where
         self.event_listener.notify_new_state(tunnel_state);
     }
 
-    async fn reset_rpc_sockets_on_tunnel_state_transition(
+    fn reset_rpc_sockets_on_tunnel_state_transition(
         &mut self,
         tunnel_state_transition: &TunnelStateTransition,
     ) {
         match (&self.tunnel_state, &tunnel_state_transition) {
-            // only reset the API sockets if when connected or leaving the connected state
+            // Only reset the API sockets when entering or leaving the connected state
             (&TunnelState::Connected { .. }, _) | (_, &TunnelStateTransition::Connected(_)) => {
                 self.api_handle.service().reset();
             }
@@ -1017,7 +1016,7 @@ where
             RotateWireguardKey(tx) => self.on_rotate_wireguard_key(tx).await,
             GetWireguardKey(tx) => self.on_get_wireguard_key(tx).await,
             GetVersionInfo(tx) => self.on_get_version_info(tx).await,
-            IsPerformingPostUpgrade(tx) => self.on_is_performing_post_upgrade(tx).await,
+            IsPerformingPostUpgrade(tx) => self.on_is_performing_post_upgrade(tx),
             GetCurrentVersion(tx) => self.on_get_current_version(tx),
             #[cfg(not(target_os = "android"))]
             FactoryReset(tx) => self.on_factory_reset(tx).await,
@@ -1204,7 +1203,7 @@ where
         Self::oneshot_send(tx, self.tunnel_state.clone(), "current state");
     }
 
-    async fn on_is_performing_post_upgrade(&self, tx: oneshot::Sender<bool>) {
+    fn on_is_performing_post_upgrade(&self, tx: oneshot::Sender<bool>) {
         let performing_post_upgrade = !self.migration_complete.is_complete();
         Self::oneshot_send(tx, performing_post_upgrade, "performing post upgrade");
     }
@@ -1923,7 +1922,7 @@ where
                         .notify_settings(self.settings.to_settings());
                     self.relay_selector
                         .set_config(new_selector_config(&self.settings, &self.app_version_info));
-                    if let Err(error) = self.api_handle.service().next_api_endpoint().await {
+                    if let Err(error) = self.api_handle.service().next_api_endpoint() {
                         log::error!("Failed to rotate API endpoint: {}", error);
                     }
                     self.reconnect_tunnel();
diff --git a/mullvad-daemon/src/migrations/mod.rs b/mullvad-daemon/src/migrations/mod.rs
index 243b6d0f85..5b4c82702f 100644
--- a/mullvad-daemon/src/migrations/mod.rs
+++ b/mullvad-daemon/src/migrations/mod.rs
@@ -148,7 +148,7 @@ pub(crate) async fn migrate_all(
     account_history::migrate_location(cache_dir, settings_dir).await;
     account_history::migrate_formats(settings_dir, &mut settings).await?;
 
-    let migration_data = v5::migrate(&mut settings).await?;
+    let migration_data = v5::migrate(&mut settings)?;
 
     if settings == old_settings {
         // Nothing changed
diff --git a/mullvad-daemon/src/migrations/v5.rs b/mullvad-daemon/src/migrations/v5.rs
index cfc74d8438..1e0a4a8724 100644
--- a/mullvad-daemon/src/migrations/v5.rs
+++ b/mullvad-daemon/src/migrations/v5.rs
@@ -48,7 +48,7 @@ pub enum SelectedObfuscation {
 
 // ======================================================
 
-pub(crate) struct MigrationData {
+pub struct MigrationData {
     pub token: AccountToken,
     pub wg_data: Option<serde_json::Value>,
 }
@@ -68,7 +68,7 @@ pub(crate) struct MigrationData {
 /// Additionally, the WireGuard protocol constraint, if set to be using TCP, is migrated into
 /// having an active Udp2Tcp obfuscator. The protocol constraint is then removed from WireGuard
 /// settings since all WireGuard traffic is UDP.
-pub(crate) async fn migrate(settings: &mut serde_json::Value) -> Result<Option<MigrationData>> {
+pub fn migrate(settings: &mut serde_json::Value) -> Result<Option<MigrationData>> {
     if !version_matches(settings) {
         return Ok(None);
     }
@@ -329,7 +329,7 @@ mod test {
         let mut old_settings = serde_json::from_str(V5_SETTINGS).unwrap();
 
         assert!(version_matches(&mut old_settings));
-        migrate(&mut old_settings).await.unwrap();
+        migrate(&mut old_settings).unwrap();
         let new_settings: serde_json::Value = serde_json::from_str(V6_SETTINGS).unwrap();
 
         assert_eq!(&old_settings, &new_settings);