Merge pull request #1376 from WalletConnect/optimistic-pairing-removal

optimistic pairing removal
WalletConnect · Jun 27, 2024 · 94ffc4c · 94ffc4c
2 parents 8c7e413 + ccf37f8
commit 94ffc4c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Sources/WalletConnectPairing/PairingClient.swift b/Sources/WalletConnectPairing/PairingClient.swift
@@ -128,8 +128,8 @@ public class PairingClient: PairingRegisterer, PairingInteracting, PairingClient
         try await pingService.ping(topic: topic)
     }
 
-    public func disconnect(topic: String) async throws {
-        try await pairingDeleteRequester.delete(topic: topic)
+    public func disconnect(topic: String) async {
+        await pairingDeleteRequester.delete(topic: topic)
     }
 
     public func validatePairingExistance(_ topic: String) throws {

diff --git a/Sources/WalletConnectPairing/PairingClientProtocol.swift b/Sources/WalletConnectPairing/PairingClientProtocol.swift
@@ -6,6 +6,6 @@ public protocol PairingClientProtocol {
     var pairingStatePublisher: AnyPublisher<Bool, Never> {get}
     var pairingExpirationPublisher: AnyPublisher<Pairing, Never> {get}
     func pair(uri: WalletConnectURI) async throws
-    func disconnect(topic: String) async throws
+    func disconnect(topic: String) async 
     func getPairings() -> [Pairing]
 }
diff --git a/Sources/WalletConnectPairing/Services/Common/Delete/PairingDeleteRequester.swift b/Sources/WalletConnectPairing/Services/Common/Delete/PairingDeleteRequester.swift
@@ -16,13 +16,13 @@ class PairingDeleteRequester {
         self.logger = logger
     }
 
-    func delete(topic: String) async throws {
+    func delete(topic: String) async {
         let reason = PairingReasonCode.userDisconnected
         let protocolMethod = PairingProtocolMethod.delete
         let pairingDeleteParams = PairingDeleteParams(code: reason.code, message: reason.message)
         logger.debug("Will delete pairing for reason: message: \(reason.message) code: \(reason.code)")
         let request = RPCRequest(method: protocolMethod.method, params: pairingDeleteParams)
-        try await networkingInteractor.request(request, topic: topic, protocolMethod: protocolMethod)
+        try? await networkingInteractor.request(request, topic: topic, protocolMethod: protocolMethod)
         pairingStorage.delete(topic: topic)
         kms.deleteSymmetricKey(for: topic)
         networkingInteractor.unsubscribe(topic: topic)

diff --git a/Sources/WalletConnectSign/Services/SignCleanupService.swift b/Sources/WalletConnectSign/Services/SignCleanupService.swift
@@ -35,14 +35,14 @@ private extension SignCleanupService {
         let pairing = pairingStore.getAll().map { $0.topic }
         let session = sessionStore.getAll().map { $0.topic }
 
-        try await networkInteractor.batchUnsubscribe(topics: pairing + session)
+        try? await networkInteractor.batchUnsubscribe(topics: pairing + session)
     }
 
     func cleanupStorages() throws {
         pairingStore.deleteAll()
         sessionStore.deleteAll()
         sessionTopicToProposal.deleteAll()
         rpcHistory.deleteAll()
-        try kms.deleteAll()
+        try? kms.deleteAll()
     }
 }
diff --git a/Sources/Web3Wallet/Web3WalletClient.swift b/Sources/Web3Wallet/Web3WalletClient.swift
@@ -177,8 +177,8 @@ public class Web3WalletClient {
         try await pairingClient.pair(uri: uri)
     }
 
-    public func disconnectPairing(topic: String) async throws {
-        try await pairingClient.disconnect(topic: topic)
+    public func disconnectPairing(topic: String) async {
+        await pairingClient.disconnect(topic: topic)
     }
 
     /// For a wallet and a dApp to terminate a session