Unit tests build error

WalletConnect · Oct 25, 2022 · a3b4639 · a3b4639
1 parent 53f10b5
commit a3b4639
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 12 deletions.
diff --git a/Example/IntegrationTests/Auth/AuthTests.swift b/Example/IntegrationTests/Auth/AuthTests.swift
@@ -31,7 +31,7 @@ final class AuthTests: XCTestCase {
     func makeClients(prefix: String, account: Account? = nil, iatProvider: IATProvider) -> (PairingClient, AuthClient) {
         let logger = ConsoleLogger(suffix: prefix, loggingLevel: .debug)
         let keychain = KeychainStorageMock()
-        let relayClient = RelayClient(relayHost: InputConfig.relayHost, projectId: InputConfig.projectId, keychainStorage: keychain, socketFactory: SocketFactory(), logger: logger)
+        let relayClient = RelayClient(relayHost: InputConfig.relayHost, projectId: InputConfig.projectId, keychainStorage: keychain, socketFactory: SocketFactory(), logger: logger, timeout: Int(InputConfig.defaultTimeout))
         let keyValueStorage = RuntimeKeyValueStorage()
 
         let networkingClient = NetworkingClientFactory.create(

diff --git a/Example/IntegrationTests/Chat/ChatTests.swift b/Example/IntegrationTests/Chat/ChatTests.swift
@@ -21,7 +21,7 @@ final class ChatTests: XCTestCase {
     func makeClient(prefix: String) -> ChatClient {
         let logger = ConsoleLogger(suffix: prefix, loggingLevel: .debug)
         let keychain = KeychainStorageMock()
-        let relayClient = RelayClient(relayHost: InputConfig.relayHost, projectId: InputConfig.projectId, keychainStorage: keychain, socketFactory: SocketFactory(), logger: logger)
+        let relayClient = RelayClient(relayHost: InputConfig.relayHost, projectId: InputConfig.projectId, keychainStorage: keychain, socketFactory: SocketFactory(), logger: logger, timeout: Int(InputConfig.defaultTimeout))
         return ChatClientFactory.create(registry: registry, relayClient: relayClient, kms: KeyManagementService(keychain: keychain), logger: logger, keyValueStorage: RuntimeKeyValueStorage())
     }
 

diff --git a/Example/IntegrationTests/Pairing/PairingTests.swift b/Example/IntegrationTests/Pairing/PairingTests.swift
@@ -35,7 +35,8 @@ final class PairingTests: XCTestCase {
             keyValueStorage: RuntimeKeyValueStorage(),
             keychainStorage: keychain,
             socketFactory: SocketFactory(),
-            logger: relayLogger)
+            logger: relayLogger,
+            timeout: Int(InputConfig.defaultTimeout))
 
         let networkingClient = NetworkingClientFactory.create(
             relayClient: relayClient,

diff --git a/Example/IntegrationTests/Relay/RelayClientEndToEndTests.swift b/Example/IntegrationTests/Relay/RelayClientEndToEndTests.swift
@@ -21,7 +21,7 @@ final class RelayClientEndToEndTests: XCTestCase {
         let socket = WebSocket(url: urlFactory.create(host: InputConfig.relayHost, projectId: InputConfig.projectId))
 
         let logger = ConsoleLogger()
-        let dispatcher = Dispatcher(socket: socket, socketConnectionHandler: ManualSocketConnectionHandler(socket: socket), logger: logger)
+        let dispatcher = Dispatcher(socket: socket, socketConnectionHandler: ManualSocketConnectionHandler(socket: socket), logger: logger, timeout: Int(InputConfig.defaultTimeout))
         return RelayClient(dispatcher: dispatcher, logger: logger, keyValueStorage: RuntimeKeyValueStorage(), clientIdStorage: clientIdStorage)
     }
 

diff --git a/Example/IntegrationTests/Sign/SignClientTests.swift b/Example/IntegrationTests/Sign/SignClientTests.swift
@@ -21,7 +21,8 @@ final class SignClientTests: XCTestCase {
             keychainStorage: keychain,
             socketFactory: SocketFactory(),
             socketConnectionType: .automatic,
-            logger: logger
+            logger: logger,
+            timeout: Int(InputConfig.defaultTimeout)
         )
         let keyValueStorage = RuntimeKeyValueStorage()
 

diff --git a/Sources/WalletConnectRelay/Dispatching.swift b/Sources/WalletConnectRelay/Dispatching.swift
@@ -18,7 +18,7 @@ final class Dispatcher: NSObject, Dispatching {
     var socketConnectionHandler: SocketConnectionHandler
 
     private let logger: ConsoleLogging
-    private let defaultTimeout: Int = 5
+    private let timeout: Int
 
     private let socketConnectionStatusPublisherSubject = PassthroughSubject<SocketConnectionStatus, Never>()
 
@@ -28,11 +28,15 @@ final class Dispatcher: NSObject, Dispatching {
 
     private let concurrentQueue = DispatchQueue(label: "com.walletconnect.sdk.dispatcher", attributes: .concurrent)
 
-    init(socket: WebSocketConnecting,
-         socketConnectionHandler: SocketConnectionHandler,
-         logger: ConsoleLogging) {
+    init(
+        socket: WebSocketConnecting,
+        socketConnectionHandler: SocketConnectionHandler,
+        logger: ConsoleLogging,
+        timeout: Int
+    ) {
         self.socket = socket
         self.logger = logger
+        self.timeout = timeout
         self.socketConnectionHandler = socketConnectionHandler
         super.init()
         setUpWebSocketSession()
@@ -58,7 +62,7 @@ final class Dispatcher: NSObject, Dispatching {
         cancellable = socketConnectionStatusPublisher
             .filter { $0 == .connected }
             .setFailureType(to: NetworkError.self)
-            .timeout(.seconds(defaultTimeout), scheduler: concurrentQueue, customError: { .webSocketNotConnected })
+            .timeout(.seconds(timeout), scheduler: concurrentQueue, customError: { .webSocketNotConnected })
             .sink(receiveCompletion: { result in
                 switch result {
                 case .failure(let error):

diff --git a/Sources/WalletConnectRelay/RelayClient.swift b/Sources/WalletConnectRelay/RelayClient.swift
@@ -84,7 +84,8 @@ public final class RelayClient {
         keychainStorage: KeychainStorageProtocol = KeychainStorage(serviceIdentifier: "com.walletconnect.sdk"),
         socketFactory: WebSocketFactory,
         socketConnectionType: SocketConnectionType = .automatic,
-        logger: ConsoleLogging = ConsoleLogger(loggingLevel: .off)
+        logger: ConsoleLogging = ConsoleLogger(loggingLevel: .off),
+        timeout: Int = 5
     ) {
         let didKeyFactory = ED25519DIDKeyFactory()
         let clientIdStorage = ClientIdStorage(keychain: keychainStorage, didKeyFactory: didKeyFactory)
@@ -106,7 +107,7 @@ public final class RelayClient {
         case .manual:
             socketConnectionHandler = ManualSocketConnectionHandler(socket: socket)
         }
-        let dispatcher = Dispatcher(socket: socket, socketConnectionHandler: socketConnectionHandler, logger: logger)
+        let dispatcher = Dispatcher(socket: socket, socketConnectionHandler: socketConnectionHandler, logger: logger, timeout: timeout)
         self.init(dispatcher: dispatcher, logger: logger, keyValueStorage: keyValueStorage, clientIdStorage: clientIdStorage)
     }