Clarify todo comments

mullvad · Sep 5, 2024 · f8638f9 · f8638f9
1 parent ce54ef5
commit f8638f9
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/ios/MullvadRustRuntime/PacketTunnelProvider+TCPConnection.swift b/ios/MullvadRustRuntime/PacketTunnelProvider+TCPConnection.swift
@@ -78,7 +78,7 @@ func tcpConnectionReceive(
     }
 }
 
-/// End sequence of a quantum-secure pre shared key exchange.
+/// End sequence of an ephemeral peer exchange.
 ///
 /// This FFI function is called by Rust when an ephemeral peer negotiation succeeded or failed.
 /// When both the `rawPresharedKey` and the `rawEphemeralKey` are raw pointers to 32 bytes data arrays,

diff --git a/ios/MullvadVPN/TunnelManager/TunnelState+UI.swift b/ios/MullvadVPN/TunnelManager/TunnelState+UI.swift
@@ -49,7 +49,7 @@ extension TunnelState {
                 )
             }
 
-        // TODO: How to Handle Daita here ?
+        // TODO: Handle Daita here in an upcoming PR for the UI
         case .negotiatingEphemeralPeer:
             NSLocalizedString(
                 "TUNNEL_STATE_NEGOTIATING_KEY",

diff --git a/ios/MullvadVPN/TunnelManager/TunnelState.swift b/ios/MullvadVPN/TunnelManager/TunnelState.swift
@@ -52,7 +52,6 @@ enum TunnelState: Equatable, CustomStringConvertible {
     /// Connecting the tunnel.
     case connecting(SelectedRelays?, isPostQuantum: Bool)
 
-    // TODO: Add information here to support Daita ???
     /// Negotiating an ephemeral peer either for post-quantum resistance or Daita
     case negotiatingEphemeralPeer(SelectedRelays, PrivateKey)
 
@@ -113,7 +112,7 @@ enum TunnelState: Equatable, CustomStringConvertible {
         case let .error(blockedStateReason):
             "error state: \(blockedStateReason)"
         case let .negotiatingEphemeralPeer(tunnelRelays, _):
-            // TODO: Handle Daita and PQ here
+            // TODO: Handle Daita and PQ here in an upcoming PR for the UI
             """
             negotiating key with exit relay: \(tunnelRelays.exit.hostname)\
             \(tunnelRelays.entry.flatMap { " via \($0.hostname)" } ?? "")

diff --git a/ios/PacketTunnelCore/Actor/ObservedState+Extensions.swift b/ios/PacketTunnelCore/Actor/ObservedState+Extensions.swift
@@ -16,7 +16,6 @@ extension ObservedState {
             "Connected"
         case .connecting:
             "Connecting"
-        // TODO: Handle Daita here ?
         case .negotiatingEphemeralPeer:
             "Negotiating Post Quantum Secure Key"
         case .reconnecting:

diff --git a/ios/PacketTunnelCore/Actor/PacketTunnelActorCommand.swift b/ios/PacketTunnelCore/Actor/PacketTunnelActorCommand.swift
@@ -73,11 +73,10 @@ extension PacketTunnelActor {
                 return "networkReachability"
             case .switchKey:
                 return "switchKey"
-            // TODO: Handle Daita here ???
             case .ephemeralPeerNegotiationStateChanged:
-                return "postQuantumNegotiationStateChanged"
+                return "ephemeralPeerNegotiationStateChanged"
             case .notifyEphemeralPeerNegotiated:
-                return "notifyPostQuantumKeyExchanged"
+                return "notifyEphemeralPeerNegotiated"
             }
         }
     }

diff --git a/mullvad-ios/src/post_quantum_proxy/ios_runtime.rs b/mullvad-ios/src/post_quantum_proxy/ios_runtime.rs
@@ -139,7 +139,6 @@ impl IOSRuntime {
         let (async_provider, shutdown_handle) = unsafe {
             match Self::ios_tcp_client(self.packet_tunnel.clone()).await {
                 Ok(result) => result,
-
                 Err(error) => {
                     log::error!("Failed to create iOS TCP client: {error}");
                     swift_ephemeral_peer_ready(