Move AnyTransportProvider under REST namespace for consistency

3 files changed, 11 insertions, 9 deletions

diff --git a/ios/MullvadREST/RESTTransportProvider.swift b/ios/MullvadREST/RESTTransportProvider.swift
index ed683fa163..5476338ece 100644
--- a/ios/MullvadREST/RESTTransportProvider.swift
+++ b/ios/MullvadREST/RESTTransportProvider.swift
@@ -12,14 +12,16 @@ public protocol RESTTransportProvider {
     func makeTransport() -> RESTTransport?
 }
 
-public struct AnyTransportProvider: RESTTransportProvider {
-    private let block: () -> RESTTransport?
+extension REST {
+    public struct AnyTransportProvider: RESTTransportProvider {
+        private let block: () -> RESTTransport?
 
-    public init(_ block: @escaping () -> RESTTransport?) {
-        self.block = block
-    }
+        public init(_ block: @escaping () -> RESTTransport?) {
+            self.block = block
+        }
 
-    public func makeTransport() -> RESTTransport? {
-        return block()
+        public func makeTransport() -> RESTTransport? {
+            return block()
+        }
     }
 }
diff --git a/ios/MullvadRESTTests/RequestExecutorTests.swift b/ios/MullvadRESTTests/RequestExecutorTests.swift
index bf8559b422..e4ca6b9537 100644
--- a/ios/MullvadRESTTests/RequestExecutorTests.swift
+++ b/ios/MullvadRESTTests/RequestExecutorTests.swift
@@ -17,7 +17,7 @@ final class RequestExecutorTests: XCTestCase {
     override func setUp() {
         super.setUp()
 
-        let transportProvider = AnyTransportProvider {
+        let transportProvider = REST.AnyTransportProvider {
             return AnyTransport {
                 return Response(delay: 1, statusCode: 200, value: TimeResponse(dateTime: Date()))
             }
diff --git a/ios/MullvadVPN/AppDelegate.swift b/ios/MullvadVPN/AppDelegate.swift
index 930f700246..4c99cfd857 100644
--- a/ios/MullvadVPN/AppDelegate.swift
+++ b/ios/MullvadVPN/AppDelegate.swift
@@ -59,7 +59,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         addressCache.loadFromFile()
 
         proxyFactory = REST.ProxyFactory.makeProxyFactory(
-            transportProvider: AnyTransportProvider { [weak self] in
+            transportProvider: REST.AnyTransportProvider { [weak self] in
                 return self?.transportMonitor.makeTransport()
             },
             addressCache: addressCache