TunnelSim: migrate to throwing functions

1 files changed, 21 insertions, 18 deletions

diff --git a/ios/MullvadVPN/SimulatorTunnelProviderHost.swift b/ios/MullvadVPN/SimulatorTunnelProviderHost.swift
index d216fc2271..7ad0d19a34 100644
--- a/ios/MullvadVPN/SimulatorTunnelProviderHost.swift
+++ b/ios/MullvadVPN/SimulatorTunnelProviderHost.swift
@@ -83,26 +83,29 @@ class SimulatorTunnelProviderHost: SimulatorTunnelProviderDelegate {
     }
 
     private func pickRelay() -> RelaySelectorResult? {
-        switch RelayCache.Tracker.shared.readAndWait() {
-        case .success(let cachedRelays):
-            do {
-                let tunnelSettings = try SettingsManager.readSettings()
-
-                return RelaySelector.evaluate(
-                    relays: cachedRelays.relays,
-                    constraints: tunnelSettings.relayConstraints
-                )
-            } catch {
-                providerLogger.error(
-                    chainedError: AnyChainedError(error),
-                    message: "Failed to read settings when picking relay."
-                )
+        let cachedRelays: RelayCache.CachedRelays
+        do {
+            cachedRelays = try RelayCache.Tracker.shared.readAndWait()
+        } catch {
+            providerLogger.error(
+                chainedError: AnyChainedError(error),
+                message: "Failed to read relays when picking relay."
+            )
+            return nil
+        }
 
-                return nil
-            }
+        do {
+            let tunnelSettings = try SettingsManager.readSettings()
 
-        case .failure(let error):
-            self.providerLogger.error(chainedError: error, message: "Failed to read relays when picking relay.")
+            return RelaySelector.evaluate(
+                relays: cachedRelays.relays,
+                constraints: tunnelSettings.relayConstraints
+            )
+        } catch {
+            providerLogger.error(
+                chainedError: AnyChainedError(error),
+                message: "Failed to read settings when picking relay."
+            )
             return nil
         }
     }