Use a more appropriate protocol name

mullvad · Jun 13, 2024 · e8a3388 · e8a3388
1 parent d76fa40
commit e8a3388
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/ios/MullvadPostQuantum/PostQuantumKeyNegotiator.swift b/ios/MullvadPostQuantum/PostQuantumKeyNegotiator.swift
@@ -14,7 +14,7 @@ import TalpidTunnelConfigClientProxy
 import WireGuardKitTypes
 
 // swiftlint:disable function_parameter_count
-public protocol PostQuantumKeyNegotiation {
+public protocol PostQuantumKeyNegotiating {
     func startNegotiation(
         gatewayIP: IPv4Address,
         devicePublicKey: PublicKey,
@@ -32,7 +32,7 @@ public protocol PostQuantumKeyNegotiation {
 /**
  Attempt to start the asynchronous process of key negotiation. Returns true if successfully started, false if failed.
  */
-public class PostQuantumKeyNegotiator: PostQuantumKeyNegotiation {
+public class PostQuantumKeyNegotiator: PostQuantumKeyNegotiating {
     required public init() {}
 
     var cancelToken: PostQuantumCancelToken?

diff --git a/ios/MullvadPostQuantumTests/MullvadPostQuantum+Stubs.swift b/ios/MullvadPostQuantumTests/MullvadPostQuantum+Stubs.swift
@@ -43,7 +43,7 @@ class TunnelProviderStub: TunnelProvider {
     }
 }
 
-class FailedNegotiatorStub: PostQuantumKeyNegotiation {
+class FailedNegotiatorStub: PostQuantumKeyNegotiating {
     var onCancelKeyNegotiation: (() -> Void)?
 
     required init() {
@@ -68,7 +68,7 @@ class FailedNegotiatorStub: PostQuantumKeyNegotiation {
     }
 }
 
-class SuccessfulNegotiatorStub: PostQuantumKeyNegotiation {
+class SuccessfulNegotiatorStub: PostQuantumKeyNegotiating {
     var onCancelKeyNegotiation: (() -> Void)?
     required init() {
         onCancelKeyNegotiation = nil

diff --git a/ios/PacketTunnel/PostQuantumKeyExchangeActor.swift b/ios/PacketTunnel/PostQuantumKeyExchangeActor.swift
@@ -15,7 +15,7 @@ import WireGuardKitTypes
 
 public class PostQuantumKeyExchangeActor {
     struct Negotiation {
-        var negotiator: PostQuantumKeyNegotiation
+        var negotiator: PostQuantumKeyNegotiating
         var inTunnelTCPConnection: NWTCPConnection
         var tcpConnectionObserver: NSKeyValueObservation
 
@@ -30,15 +30,15 @@ public class PostQuantumKeyExchangeActor {
     internal var negotiation: Negotiation?
     private var timer: DispatchSourceTimer?
     private var keyExchangeRetriesIterator: AnyIterator<Duration>
-    private let negotiationProvider: PostQuantumKeyNegotiation.Type
+    private let negotiationProvider: PostQuantumKeyNegotiating.Type
 
     // Callback in the event of the negotiation failing on startup
     var onFailure: () -> Void
 
     public init(
         packetTunnel: any TunnelProvider,
         onFailure: @escaping (() -> Void),
-        negotiationProvider: PostQuantumKeyNegotiation.Type = PostQuantumKeyNegotiator.self,
+        negotiationProvider: PostQuantumKeyNegotiating.Type = PostQuantumKeyNegotiator.self,
         keyExchangeRetriesIterator: AnyIterator<Duration> = REST.RetryStrategy.postQuantumKeyExchange
             .makeDelayIterator()
     ) {