Simulator: update tunnel sim to use new settings

1 files changed, 8 insertions, 6 deletions

diff --git a/ios/MullvadVPN/SimulatorTunnelProviderHost.swift b/ios/MullvadVPN/SimulatorTunnelProviderHost.swift
index 9f6bf5fc78..d216fc2271 100644
--- a/ios/MullvadVPN/SimulatorTunnelProviderHost.swift
+++ b/ios/MullvadVPN/SimulatorTunnelProviderHost.swift
@@ -85,16 +85,18 @@ class SimulatorTunnelProviderHost: SimulatorTunnelProviderDelegate {
     private func pickRelay() -> RelaySelectorResult? {
         switch RelayCache.Tracker.shared.readAndWait() {
         case .success(let cachedRelays):
-            let keychainReference = self.protocolConfiguration.passwordReference!
+            do {
+                let tunnelSettings = try SettingsManager.readSettings()
 
-            switch TunnelSettingsManager.load(searchTerm: .persistentReference(keychainReference)) {
-            case .success(let entry):
                 return RelaySelector.evaluate(
                     relays: cachedRelays.relays,
-                    constraints: entry.tunnelSettings.relayConstraints
+                    constraints: tunnelSettings.relayConstraints
+                )
+            } catch {
+                providerLogger.error(
+                    chainedError: AnyChainedError(error),
+                    message: "Failed to read settings when picking relay."
                 )
-            case .failure(let error):
-                self.providerLogger.error(chainedError: error, message: "Failed to load tunnel settings when picking relay.")
 
                 return nil
             }