summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls <emils@mullvad.net>2026-04-10 16:02:56 +0200
committerJon Petersson <jon.petersson@mullvad.net>2026-04-13 13:19:02 +0200
commit619da437cbb18cdb1d5e4a60029562605841d2e8 (patch)
tree7392c1e7f86c88c96049884a8998e232a8823767
parent9af0b24a34015ed6430c252761b0cb5d9c06d92d (diff)
downloadmullvadvpn-619da437cbb18cdb1d5e4a60029562605841d2e8.tar.xz
mullvadvpn-619da437cbb18cdb1d5e4a60029562605841d2e8.zip
Remove unnecessary WireGuardKitTypes imports
-rw-r--r--ios/MullvadMockData/MullvadTypes/DeviceMock.swift2
-rw-r--r--ios/MullvadSettings/TunnelSettingsV1.swift3
-rw-r--r--ios/MullvadTypes/RESTTypes.swift2
-rw-r--r--ios/MullvadVPN/View controllers/DeviceList/DeviceManaging.swift3
-rw-r--r--ios/MullvadVPNTests/MullvadVPN/PacketTunnel/DeviceCheck/DeviceCheckOperationTests.swift3
-rw-r--r--ios/MullvadVPNTests/MullvadVPN/TunnelManager/StartTunnelOperationTests.swift2
-rw-r--r--ios/MullvadVPNTests/MullvadVPN/TunnelManager/WgKeyRotationTests.swift2
-rw-r--r--ios/PacketTunnel/PostQuantum/MultiHopEphemeralPeerExchanger.swift3
-rw-r--r--ios/PacketTunnel/PostQuantum/SingleHopEphemeralPeerExchanger.swift3
-rw-r--r--ios/PacketTunnelCore/Actor/ConfigurationBuilder.swift4
-rw-r--r--ios/PacketTunnelCore/Actor/ConnectionConfigurationBuilder.swift2
-rw-r--r--ios/PacketTunnelCore/Actor/EphemeralPeerNegotiationState.swift3
-rw-r--r--ios/PacketTunnelCore/Actor/PacketTunnelActor+ErrorState.swift3
-rw-r--r--ios/PacketTunnelCore/Actor/Protocols/SettingsReaderProtocol.swift2
-rw-r--r--ios/PacketTunnelCore/Actor/Protocols/TunnelAdapterProtocol.swift4
-rw-r--r--ios/PacketTunnelCoreTests/Mocks/SettingsReaderStub.swift2
-rw-r--r--ios/PacketTunnelCoreTests/PacketTunnelActorTests.swift2
17 files changed, 0 insertions, 45 deletions
diff --git a/ios/MullvadMockData/MullvadTypes/DeviceMock.swift b/ios/MullvadMockData/MullvadTypes/DeviceMock.swift
index 1fe9c045c6..b16041f284 100644
--- a/ios/MullvadMockData/MullvadTypes/DeviceMock.swift
+++ b/ios/MullvadMockData/MullvadTypes/DeviceMock.swift
@@ -9,8 +9,6 @@
import Foundation
import MullvadTypes
-import class WireGuardKitTypes.PublicKey
-
extension Device {
public static func mock(publicKey: WireGuard.PublicKey) -> Device {
Device(
diff --git a/ios/MullvadSettings/TunnelSettingsV1.swift b/ios/MullvadSettings/TunnelSettingsV1.swift
index 39b9e04142..1f2220ab13 100644
--- a/ios/MullvadSettings/TunnelSettingsV1.swift
+++ b/ios/MullvadSettings/TunnelSettingsV1.swift
@@ -10,9 +10,6 @@ import Foundation
import MullvadTypes
import Network
-import class WireGuardKitTypes.PrivateKey
-import class WireGuardKitTypes.PublicKey
-
/// A struct that holds the configuration passed via `NETunnelProviderProtocol`.
public struct TunnelSettingsV1: Codable, Equatable, TunnelSettings {
public var relayConstraints = RelayConstraints()
diff --git a/ios/MullvadTypes/RESTTypes.swift b/ios/MullvadTypes/RESTTypes.swift
index df63b0b4fc..010c07d868 100644
--- a/ios/MullvadTypes/RESTTypes.swift
+++ b/ios/MullvadTypes/RESTTypes.swift
@@ -8,8 +8,6 @@
import Foundation
-import class WireGuardKitTypes.PublicKey
-
public struct Account: Codable, Equatable, Sendable {
public let id: String
public let expiry: Date
diff --git a/ios/MullvadVPN/View controllers/DeviceList/DeviceManaging.swift b/ios/MullvadVPN/View controllers/DeviceList/DeviceManaging.swift
index b4fa18618a..9a938c627a 100644
--- a/ios/MullvadVPN/View controllers/DeviceList/DeviceManaging.swift
+++ b/ios/MullvadVPN/View controllers/DeviceList/DeviceManaging.swift
@@ -10,9 +10,6 @@ import Foundation
import MullvadREST
import MullvadTypes
-import class WireGuardKitTypes.PrivateKey
-import class WireGuardKitTypes.PublicKey
-
protocol DeviceManaging {
var currentDeviceId: String? { get }
func getDevices(_ completionHandler: @escaping @Sendable (Result<[Device], Error>) -> Void) -> Cancellable
diff --git a/ios/MullvadVPNTests/MullvadVPN/PacketTunnel/DeviceCheck/DeviceCheckOperationTests.swift b/ios/MullvadVPNTests/MullvadVPN/PacketTunnel/DeviceCheck/DeviceCheckOperationTests.swift
index baed5d13a9..cb8a77a054 100644
--- a/ios/MullvadVPNTests/MullvadVPN/PacketTunnel/DeviceCheck/DeviceCheckOperationTests.swift
+++ b/ios/MullvadVPNTests/MullvadVPN/PacketTunnel/DeviceCheck/DeviceCheckOperationTests.swift
@@ -13,9 +13,6 @@ import Operations
import PacketTunnelCore
import XCTest
-@preconcurrency import class WireGuardKitTypes.PrivateKey
-@preconcurrency import class WireGuardKitTypes.PublicKey
-
@testable import MullvadMockData
class DeviceCheckOperationTests: XCTestCase {
diff --git a/ios/MullvadVPNTests/MullvadVPN/TunnelManager/StartTunnelOperationTests.swift b/ios/MullvadVPNTests/MullvadVPN/TunnelManager/StartTunnelOperationTests.swift
index abf156b74f..76c4c599e0 100644
--- a/ios/MullvadVPNTests/MullvadVPN/TunnelManager/StartTunnelOperationTests.swift
+++ b/ios/MullvadVPNTests/MullvadVPN/TunnelManager/StartTunnelOperationTests.swift
@@ -12,8 +12,6 @@ import Network
import Operations
import XCTest
-import class WireGuardKitTypes.PrivateKey
-
@testable import MullvadMockData
class StartTunnelOperationTests: XCTestCase {
diff --git a/ios/MullvadVPNTests/MullvadVPN/TunnelManager/WgKeyRotationTests.swift b/ios/MullvadVPNTests/MullvadVPN/TunnelManager/WgKeyRotationTests.swift
index 5f6ba6f609..adf844a77c 100644
--- a/ios/MullvadVPNTests/MullvadVPN/TunnelManager/WgKeyRotationTests.swift
+++ b/ios/MullvadVPNTests/MullvadVPN/TunnelManager/WgKeyRotationTests.swift
@@ -10,8 +10,6 @@ import MullvadSettings
import MullvadTypes
import XCTest
-import class WireGuardKitTypes.PrivateKey
-
final class WgKeyRotationTests: XCTestCase {
func testKeyRotationLifecycle() {
let data = StoredDeviceData.mock(
diff --git a/ios/PacketTunnel/PostQuantum/MultiHopEphemeralPeerExchanger.swift b/ios/PacketTunnel/PostQuantum/MultiHopEphemeralPeerExchanger.swift
index 2acbea53ea..b9cab89eee 100644
--- a/ios/PacketTunnel/PostQuantum/MultiHopEphemeralPeerExchanger.swift
+++ b/ios/PacketTunnel/PostQuantum/MultiHopEphemeralPeerExchanger.swift
@@ -12,9 +12,6 @@ import MullvadSettings
import MullvadTypes
import PacketTunnelCore
-import class WireGuardKitTypes.PreSharedKey
-import class WireGuardKitTypes.PrivateKey
-
final class MultiHopEphemeralPeerExchanger: EphemeralPeerExchangingProtocol {
let entry: SelectedRelay
let exit: SelectedRelay
diff --git a/ios/PacketTunnel/PostQuantum/SingleHopEphemeralPeerExchanger.swift b/ios/PacketTunnel/PostQuantum/SingleHopEphemeralPeerExchanger.swift
index 471e2f869b..9600059141 100644
--- a/ios/PacketTunnel/PostQuantum/SingleHopEphemeralPeerExchanger.swift
+++ b/ios/PacketTunnel/PostQuantum/SingleHopEphemeralPeerExchanger.swift
@@ -12,9 +12,6 @@ import MullvadSettings
import MullvadTypes
import PacketTunnelCore
-import class WireGuardKitTypes.PreSharedKey
-import class WireGuardKitTypes.PrivateKey
-
struct SingleHopEphemeralPeerExchanger: EphemeralPeerExchangingProtocol {
let exit: SelectedRelay
let keyExchanger: EphemeralPeerExchangeActorProtocol
diff --git a/ios/PacketTunnelCore/Actor/ConfigurationBuilder.swift b/ios/PacketTunnelCore/Actor/ConfigurationBuilder.swift
index fa212cdc86..b716362bf0 100644
--- a/ios/PacketTunnelCore/Actor/ConfigurationBuilder.swift
+++ b/ios/PacketTunnelCore/Actor/ConfigurationBuilder.swift
@@ -10,10 +10,6 @@ import Foundation
import MullvadTypes
import Network
-import class WireGuardKitTypes.PreSharedKey
-import class WireGuardKitTypes.PrivateKey
-import class WireGuardKitTypes.PublicKey
-
/// Error returned when there is an endpoint but its public key is invalid.
public struct PublicKeyError: LocalizedError {
let endpoint: SelectedEndpoint
diff --git a/ios/PacketTunnelCore/Actor/ConnectionConfigurationBuilder.swift b/ios/PacketTunnelCore/Actor/ConnectionConfigurationBuilder.swift
index 9c8af2297d..09cec3dd5e 100644
--- a/ios/PacketTunnelCore/Actor/ConnectionConfigurationBuilder.swift
+++ b/ios/PacketTunnelCore/Actor/ConnectionConfigurationBuilder.swift
@@ -10,8 +10,6 @@ import Foundation
import MullvadTypes
import Network
-import class WireGuardKitTypes.PrivateKey
-
protocol Configuration {
var name: String { get }
func make() throws -> ConnectionConfiguration
diff --git a/ios/PacketTunnelCore/Actor/EphemeralPeerNegotiationState.swift b/ios/PacketTunnelCore/Actor/EphemeralPeerNegotiationState.swift
index f4c40cfcd6..1925d87a87 100644
--- a/ios/PacketTunnelCore/Actor/EphemeralPeerNegotiationState.swift
+++ b/ios/PacketTunnelCore/Actor/EphemeralPeerNegotiationState.swift
@@ -9,9 +9,6 @@
import MullvadREST
import MullvadTypes
-@preconcurrency import class WireGuardKitTypes.PreSharedKey
-@preconcurrency import class WireGuardKitTypes.PrivateKey
-
public enum EphemeralPeerNegotiationState: Equatable, Sendable {
case single(EphemeralPeerRelayConfiguration)
case multi(entry: EphemeralPeerRelayConfiguration, exit: EphemeralPeerRelayConfiguration)
diff --git a/ios/PacketTunnelCore/Actor/PacketTunnelActor+ErrorState.swift b/ios/PacketTunnelCore/Actor/PacketTunnelActor+ErrorState.swift
index 068a2d2e3a..db376bb9d5 100644
--- a/ios/PacketTunnelCore/Actor/PacketTunnelActor+ErrorState.swift
+++ b/ios/PacketTunnelCore/Actor/PacketTunnelActor+ErrorState.swift
@@ -10,9 +10,6 @@ import Foundation
import MullvadTypes
import Network
-import class WireGuardKitTypes.PrivateKey
-import class WireGuardKitTypes.PublicKey
-
extension PacketTunnelActor {
/**
Transition actor to error state.
diff --git a/ios/PacketTunnelCore/Actor/Protocols/SettingsReaderProtocol.swift b/ios/PacketTunnelCore/Actor/Protocols/SettingsReaderProtocol.swift
index 1817a3e3e6..f4442b52bd 100644
--- a/ios/PacketTunnelCore/Actor/Protocols/SettingsReaderProtocol.swift
+++ b/ios/PacketTunnelCore/Actor/Protocols/SettingsReaderProtocol.swift
@@ -11,8 +11,6 @@ import MullvadSettings
import MullvadTypes
import Network
-@preconcurrency import class WireGuardKitTypes.PrivateKey
-
/// A type that implements a reader that can return settings required by `PacketTunnelActor` in order to configure the tunnel.
public protocol SettingsReaderProtocol {
/**
diff --git a/ios/PacketTunnelCore/Actor/Protocols/TunnelAdapterProtocol.swift b/ios/PacketTunnelCore/Actor/Protocols/TunnelAdapterProtocol.swift
index 0345b65c31..7dbc915d2b 100644
--- a/ios/PacketTunnelCore/Actor/Protocols/TunnelAdapterProtocol.swift
+++ b/ios/PacketTunnelCore/Actor/Protocols/TunnelAdapterProtocol.swift
@@ -11,10 +11,6 @@ import MullvadTypes
import Network
import NetworkExtension
-@preconcurrency import class WireGuardKitTypes.PreSharedKey
-@preconcurrency import class WireGuardKitTypes.PrivateKey
-@preconcurrency import class WireGuardKitTypes.PublicKey
-
/// Protocol describing interface for any kind of adapter implementing a VPN tunnel.
public protocol TunnelAdapterProtocol: Sendable {
/// Start tunnel adapter or update active configuration.
diff --git a/ios/PacketTunnelCoreTests/Mocks/SettingsReaderStub.swift b/ios/PacketTunnelCoreTests/Mocks/SettingsReaderStub.swift
index 090b19d6f6..d9941f40fe 100644
--- a/ios/PacketTunnelCoreTests/Mocks/SettingsReaderStub.swift
+++ b/ios/PacketTunnelCoreTests/Mocks/SettingsReaderStub.swift
@@ -10,8 +10,6 @@ import Foundation
import MullvadTypes
import PacketTunnelCore
-import class WireGuardKitTypes.PrivateKey
-
@testable import MullvadSettings
/// Settings reader stub that can be configured with a block to provide the desired behavior when testing.
diff --git a/ios/PacketTunnelCoreTests/PacketTunnelActorTests.swift b/ios/PacketTunnelCoreTests/PacketTunnelActorTests.swift
index 561b3d0f18..1a6dced524 100644
--- a/ios/PacketTunnelCoreTests/PacketTunnelActorTests.swift
+++ b/ios/PacketTunnelCoreTests/PacketTunnelActorTests.swift
@@ -11,8 +11,6 @@ import MullvadTypes
import Network
import XCTest
-import class WireGuardKitTypes.PrivateKey
-
@testable import MullvadMockData
@testable import MullvadREST
@testable import MullvadSettings