[Core] Add Relay Client factory

Example/IntegrationTests/Auth/AuthTests.swift

@@ -32,9 +32,15 @@ final class AuthTests: XCTestCase {
 
     func makeClients(prefix: String, 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: DefaultSocketFactory(), logger: logger)
         let keyValueStorage = RuntimeKeyValueStorage()
+        let keychain = KeychainStorageMock()
+        let relayClient = RelayClientFactory.create(
+            relayHost: InputConfig.relayHost,
+            projectId: InputConfig.projectId,
+            keyValueStorage: keyValueStorage,
+            keychainStorage: keychain,
+            socketFactory: DefaultSocketFactory(),
+            logger: logger)
 
         let networkingClient = NetworkingClientFactory.create(
             relayClient: relayClient,

Example/IntegrationTests/Chat/ChatTests.swift

@@ -48,9 +48,16 @@ final class ChatTests: XCTestCase {
     func makeClient(prefix: String, account: Account) -> ChatClient {
         let keyserverURL = URL(string: "https://keys.walletconnect.com")!
         let logger = ConsoleLogger(suffix: prefix, loggingLevel: .debug)
-        let keychain = KeychainStorageMock()
-        let relayClient = RelayClient(relayHost: InputConfig.relayHost, projectId: InputConfig.projectId, keychainStorage: keychain, socketFactory: DefaultSocketFactory(), logger: logger)
         let keyValueStorage = RuntimeKeyValueStorage()
+        let keychain = KeychainStorageMock()
+        let relayClient = RelayClientFactory.create(
+            relayHost: InputConfig.relayHost,
+            projectId: InputConfig.projectId,
+            keyValueStorage: keyValueStorage,
+            keychainStorage: keychain,
+            socketFactory: DefaultSocketFactory(),
+            logger: logger)
+
         let networkingInteractor = NetworkingClientFactory.create(
             relayClient: relayClient,
             logger: logger,

Example/IntegrationTests/History/HistoryTests.swift

@@ -24,7 +24,7 @@ final class HistoryTests: XCTestCase {
     }
 
     private func makeRelayClient(prefix: String, keychain: KeychainStorageProtocol) -> RelayClient {
-        return RelayClient(
+        return RelayClientFactory.create(
             relayHost: InputConfig.relayHost,
             projectId: InputConfig.projectId,
             keyValueStorage: RuntimeKeyValueStorage(),

Example/IntegrationTests/Pairing/PairingTests.swift

@@ -29,7 +29,7 @@ final class PairingTests: XCTestCase {
         let pairingLogger = ConsoleLogger(suffix: prefix + " [Pairing]", loggingLevel: .debug)
         let networkingLogger = ConsoleLogger(suffix: prefix + " [Networking]", loggingLevel: .debug)
 
-        let relayClient = RelayClient(
+        let relayClient = RelayClientFactory.create(
             relayHost: InputConfig.relayHost,
             projectId: InputConfig.projectId,
             keyValueStorage: RuntimeKeyValueStorage(),

Example/IntegrationTests/Push/PushTests.swift

@@ -32,10 +32,10 @@ final class PushTests: XCTestCase {
         let pairingLogger = ConsoleLogger(suffix: prefix + " [Pairing]", loggingLevel: .debug)
         let networkingLogger = ConsoleLogger(suffix: prefix + " [Networking]", loggingLevel: .debug)
 
-        let relayClient = RelayClient(
+        let relayClient = RelayClientFactory.create(
             relayHost: InputConfig.relayHost,
             projectId: InputConfig.projectId,
-            keyValueStorage: RuntimeKeyValueStorage(),
+            keyValueStorage: keyValueStorage,
             keychainStorage: keychain,
             socketFactory: DefaultSocketFactory(),
             logger: relayLogger)

Example/IntegrationTests/Sign/SignClientTests.swift

@@ -14,16 +14,15 @@ final class SignClientTests: XCTestCase {
     static private func makeClientDelegate(name: String) -> ClientDelegate {
         let logger = ConsoleLogger(suffix: name, loggingLevel: .debug)
         let keychain = KeychainStorageMock()
-        let relayClient = RelayClient(
+        let keyValueStorage = RuntimeKeyValueStorage()
+        let relayClient = RelayClientFactory.create(
             relayHost: InputConfig.relayHost,
             projectId: InputConfig.projectId,
-            keyValueStorage: RuntimeKeyValueStorage(),
+            keyValueStorage: keyValueStorage,
             keychainStorage: keychain,
             socketFactory: DefaultSocketFactory(),
-            socketConnectionType: .automatic,
             logger: logger
         )
-        let keyValueStorage = RuntimeKeyValueStorage()
 
         let networkingClient = NetworkingClientFactory.create(
             relayClient: relayClient,

Example/IntegrationTests/Sync/SyncTests.swift

@@ -57,7 +57,13 @@ final class SyncTests: XCTestCase {
         let kms = KeyManagementService(keychain: keychain)
         let derivationService = SyncDerivationService(syncStorage: syncSignatureStore, bip44: DefaultBIP44Provider(), kms: kms)
         let logger = ConsoleLogger(suffix: suffix, loggingLevel: .debug)
-        let relayClient = RelayClient(relayHost: InputConfig.relayHost, projectId: InputConfig.projectId, keychainStorage: keychain, socketFactory: DefaultSocketFactory(), logger: logger)
+        let relayClient = RelayClientFactory.create(
+            relayHost: InputConfig.relayHost,
+            projectId: InputConfig.projectId,
+            keyValueStorage: RuntimeKeyValueStorage(),
+            keychainStorage: keychain,
+            socketFactory: DefaultSocketFactory(),
+            logger: logger)
         let networkingInteractor = NetworkingClientFactory.create(
             relayClient: relayClient,
             logger: logger,

Example/RelayIntegrationTests/RelayClientEndToEndTests.swift

@@ -50,7 +50,17 @@ final class RelayClientEndToEndTests: XCTestCase {
             socketConnectionType: .manual,
             logger: logger
         )
-        let relayClient = RelayClient(dispatcher: dispatcher, logger: logger, keyValueStorage: RuntimeKeyValueStorage(), clientIdStorage: clientIdStorage)
+        let keychain = KeychainStorageMock()
+        let keyValueStorage = RuntimeKeyValueStorage()
+        let relayClient = RelayClientFactory.create(
+            relayHost: InputConfig.relayHost,
+            projectId: InputConfig.projectId,
+            keyValueStorage: keyValueStorage,
+            keychainStorage: keychain,
+            socketFactory: DefaultSocketFactory(),
+            socketConnectionType: .manual,
+            logger: logger
+        )
         let clientId = try! relayClient.getClientId()
         logger.debug("My client id is: \(clientId)")
 

Sources/WalletConnectRelay/Relay.swift

@@ -12,7 +12,7 @@ public class Relay {
         guard let config = Relay.config else {
             fatalError("Error - you must call Relay.configure(_:) before accessing the shared instance.")
         }
-        return RelayClient(
+        return RelayClientFactory.create(
             relayHost: config.relayHost,
             projectId: config.projectId,
             socketFactory: config.socketFactory,

Sources/WalletConnectRelay/RelayClient.swift

@@ -47,12 +47,12 @@ public final class RelayClient {
     init(
         dispatcher: Dispatching,
         logger: ConsoleLogging,
-        keyValueStorage: KeyValueStorage,
+        rpcHistory: RPCHistory,
         clientIdStorage: ClientIdStoring
     ) {
         self.logger = logger
         self.dispatcher = dispatcher
-        self.rpcHistory = RPCHistoryFactory.createForRelay(keyValueStorage: keyValueStorage)
+        self.rpcHistory = rpcHistory
         self.clientIdStorage = clientIdStorage
         setUpBindings()
     }
@@ -63,41 +63,6 @@ public final class RelayClient {
         }
     }
 
-    /// Instantiates Relay Client
-    /// - Parameters:
-    ///   - relayHost: proxy server host that your application will use to connect to Relay Network. If you register your project at `www.walletconnect.com` you can use `relay.walletconnect.com`
-    ///   - projectId: an optional parameter used to access the public WalletConnect infrastructure. Go to `www.walletconnect.com` for info.
-    ///   - keyValueStorage: by default WalletConnect SDK will store sequences in UserDefaults
-    ///   - socketConnectionType: socket connection type
-    ///   - logger: logger instance
-    public convenience init(
-        relayHost: String,
-        projectId: String,
-        keyValueStorage: KeyValueStorage = UserDefaults.standard,
-        keychainStorage: KeychainStorageProtocol = KeychainStorage(serviceIdentifier: "com.walletconnect.sdk"),
-        socketFactory: WebSocketFactory,
-        socketConnectionType: SocketConnectionType = .automatic,
-        logger: ConsoleLogging = ConsoleLogger(loggingLevel: .debug)
-    ) {
-        let clientIdStorage = ClientIdStorage(keychain: keychainStorage)
-        let socketAuthenticator = ClientIdAuthenticator(
-            clientIdStorage: clientIdStorage,
-            url: "wss://\(relayHost)"
-        )
-        let relayUrlFactory = RelayUrlFactory(
-            relayHost: relayHost,
-            projectId: projectId,
-            socketAuthenticator: socketAuthenticator
-        )
-        let dispatcher = Dispatcher(
-            socketFactory: socketFactory,
-            relayUrlFactory: relayUrlFactory,
-            socketConnectionType: socketConnectionType,
-            logger: logger
-        )
-        self.init(dispatcher: dispatcher, logger: logger, keyValueStorage: keyValueStorage, clientIdStorage: clientIdStorage)
-    }
-
     /// Connects web socket
     ///
     /// Use this method for manual socket connection only

Sources/WalletConnectRelay/RelayClientFactory.swift

@@ -0,0 +1,64 @@
+//     
+import Foundation
+
+
+public struct RelayClientFactory {
+
+    public static func create(
+        relayHost: String,
+        projectId: String,
+        socketFactory: WebSocketFactory,
+        socketConnectionType: SocketConnectionType
+    ) -> RelayClient {
+
+        let keyValueStorage = UserDefaults.standard
+
+        let keychainStorage = KeychainStorage(serviceIdentifier: "com.walletconnect.sdk")
+
+        let logger = ConsoleLogger(suffix: "🚄" ,loggingLevel: .debug)
+
+        return RelayClientFactory.create(
+            relayHost: relayHost,
+            projectId: projectId,
+            keyValueStorage: keyValueStorage,
+            keychainStorage: keychainStorage,
+            socketFactory: socketFactory,
+            socketConnectionType: socketConnectionType,
+            logger: logger
+        )
+    }
+
+
+    public static func create(
+        relayHost: String,
+        projectId: String,
+        keyValueStorage: KeyValueStorage,
+        keychainStorage: KeychainStorageProtocol,
+        socketFactory: WebSocketFactory,
+        socketConnectionType: SocketConnectionType = .automatic,
+        logger: ConsoleLogging
+    ) -> RelayClient {
+
+        let clientIdStorage = ClientIdStorage(keychain: keychainStorage)
+
+        let socketAuthenticator = ClientIdAuthenticator(
+            clientIdStorage: clientIdStorage,
+            url: "wss://\(relayHost)"
+        )
+        let relayUrlFactory = RelayUrlFactory(
+            relayHost: relayHost,
+            projectId: projectId,
+            socketAuthenticator: socketAuthenticator
+        )
+        let dispatcher = Dispatcher(
+            socketFactory: socketFactory,
+            relayUrlFactory: relayUrlFactory,
+            socketConnectionType: socketConnectionType,
+            logger: logger
+        )
+
+        let rpcHistory = RPCHistoryFactory.createForRelay(keyValueStorage: keyValueStorage)
+
+        return RelayClient(dispatcher: dispatcher, logger: logger, rpcHistory: rpcHistory, clientIdStorage: clientIdStorage)
+    }
+}

Tests/RelayerTests/RelayClientTests.swift

@@ -15,7 +15,8 @@ final class RelayClientTests: XCTestCase {
         dispatcher = DispatcherMock()
         let logger = ConsoleLogger()
         let clientIdStorage = ClientIdStorageMock()
-        sut = RelayClient(dispatcher: dispatcher, logger: logger, keyValueStorage: RuntimeKeyValueStorage(), clientIdStorage: clientIdStorage)
+        let rpcHistory = RPCHistoryFactory.createForRelay(keyValueStorage: RuntimeKeyValueStorage())
+        sut = RelayClient(dispatcher: dispatcher, logger: logger, rpcHistory: rpcHistory, clientIdStorage: clientIdStorage)
     }
 
     override func tearDown() {