diff --git a/Sources/WalletConnectPairing/Types/WCPairing.swift b/Sources/WalletConnectPairing/Types/WCPairing.swift index aada94d68..b15a45e64 100644 --- a/Sources/WalletConnectPairing/Types/WCPairing.swift +++ b/Sources/WalletConnectPairing/Types/WCPairing.swift @@ -37,7 +37,7 @@ public struct WCPairing: SequenceObject { public init(topic: String) { self.topic = topic - self.relay = RelayProtocolOptions(protocol: "iridium", data: nil) + self.relay = RelayProtocolOptions(protocol: "irn", data: nil) self.active = false self.expiryDate = Self.dateInitializer().advanced(by: Self.timeToLiveInactive) } diff --git a/Sources/WalletConnectRelay/RPC/RelayRPC.swift b/Sources/WalletConnectRelay/RPC/RelayRPC.swift index a8f3230a7..6950c42b5 100644 --- a/Sources/WalletConnectRelay/RPC/RelayRPC.swift +++ b/Sources/WalletConnectRelay/RPC/RelayRPC.swift @@ -8,10 +8,6 @@ extension RelayRPC where Parameters: Codable { return WalletConnectRPCID() } - func wrapToIridium() -> PrefixDecorator { - return PrefixDecorator(rpcMethod: self, prefix: "iridium") - } - func wrapToIRN() -> PrefixDecorator { return PrefixDecorator(rpcMethod: self, prefix: "irn") } diff --git a/Sources/WalletConnectRelay/RelayClient.swift b/Sources/WalletConnectRelay/RelayClient.swift index 94815d407..6be813de9 100644 --- a/Sources/WalletConnectRelay/RelayClient.swift +++ b/Sources/WalletConnectRelay/RelayClient.swift @@ -111,7 +111,7 @@ public final class RelayClient { /// Completes when networking client sends a request, error if it fails on client side public func publish(topic: String, payload: String, tag: Int, prompt: Bool = false) async throws { let request = Publish(params: .init(topic: topic, message: payload, ttl: defaultTtl, prompt: prompt, tag: tag)) - .wrapToIridium() + .wrapToIRN() .asRPCRequest() let message = try request.asJSONEncodedString() logger.debug("Publishing payload on topic: \(topic)") @@ -128,7 +128,7 @@ public final class RelayClient { ) { let rpc = Publish(params: .init(topic: topic, message: payload, ttl: defaultTtl, prompt: prompt, tag: tag)) let request = rpc - .wrapToIridium() + .wrapToIRN() .asRPCRequest() let message = try! request.asJSONEncodedString() logger.debug("Publishing Payload on Topic: \(topic)") @@ -153,7 +153,7 @@ public final class RelayClient { logger.debug("Relay: Subscribing to topic: \(topic)") let rpc = Subscribe(params: .init(topic: topic)) let request = rpc - .wrapToIridium() + .wrapToIRN() .asRPCRequest() let message = try! request.asJSONEncodedString() var cancellable: AnyCancellable? @@ -195,7 +195,7 @@ public final class RelayClient { logger.debug("Relay: Unsubscribing from topic: \(topic)") let rpc = Unsubscribe(params: .init(id: subscriptionId, topic: topic)) let request = rpc - .wrapToIridium() + .wrapToIRN() .asRPCRequest() let message = try! request.asJSONEncodedString() rpcHistory.deleteAll(forTopic: topic) diff --git a/Tests/WalletConnectSignTests/Stub/Stubs.swift b/Tests/WalletConnectSignTests/Stub/Stubs.swift index a0d70a4d6..67c329247 100644 --- a/Tests/WalletConnectSignTests/Stub/Stubs.swift +++ b/Tests/WalletConnectSignTests/Stub/Stubs.swift @@ -98,7 +98,7 @@ extension WCRequestSubscriptionPayload { extension SessionProposal { static func stub(proposerPubKey: String = "") -> SessionProposal { - let relayOptions = RelayProtocolOptions(protocol: "iridium", data: nil) + let relayOptions = RelayProtocolOptions(protocol: "irn", data: nil) return SessionType.ProposeParams( relays: [relayOptions], proposer: Participant(publicKey: proposerPubKey, metadata: AppMetadata.stub()), diff --git a/Tests/WalletConnectSignTests/WCRelayTests.swift b/Tests/WalletConnectSignTests/WCRelayTests.swift index 7f37f77f7..500967141 100644 --- a/Tests/WalletConnectSignTests/WCRelayTests.swift +++ b/Tests/WalletConnectSignTests/WCRelayTests.swift @@ -58,7 +58,7 @@ private let testPayload = { "id":1630300527198334, "jsonrpc":"2.0", - "method":"iridium_subscription", + "method":"irn_subscription", "params":{ "id":"0847f4e1dd19cf03a43dc7525f39896b630e9da33e4683c8efbc92ea671b5e07", "data":{ diff --git a/Tests/WalletConnectSignTests/WalletConnectURITests.swift b/Tests/WalletConnectSignTests/WalletConnectURITests.swift index f2331c626..e1e218a4b 100644 --- a/Tests/WalletConnectSignTests/WalletConnectURITests.swift +++ b/Tests/WalletConnectSignTests/WalletConnectURITests.swift @@ -3,9 +3,9 @@ import XCTest private let stubTopic = "8097df5f14871126866252c1b7479a14aefb980188fc35ec97d130d24bd887c8" private let stubSymKey = "587d5484ce2a2a6ee3ba1962fdd7e8588e06200c46823bd18fbd67def96ad303" -private let stubProtocol = "iridium" +private let stubProtocol = "irn" -private let stubURI = "wc:7f6e504bfad60b485450578e05678ed3e8e8c4751d3c6160be17160d63ec90f9@2?symKey=587d5484ce2a2a6ee3ba1962fdd7e8588e06200c46823bd18fbd67def96ad303&relay-protocol=iridium" +private let stubURI = "wc:7f6e504bfad60b485450578e05678ed3e8e8c4751d3c6160be17160d63ec90f9@2?symKey=587d5484ce2a2a6ee3ba1962fdd7e8588e06200c46823bd18fbd67def96ad303&relay-protocol=irn" final class WalletConnectURITests: XCTestCase { @@ -13,7 +13,7 @@ final class WalletConnectURITests: XCTestCase { let inputURI = WalletConnectURI( topic: "8097df5f14871126866252c1b7479a14aefb980188fc35ec97d130d24bd887c8", symKey: "19c5ecc857963976fabb98ed6a3e0a6ab6b0d65c018b6e25fbdcd3a164def868", - relay: RelayProtocolOptions(protocol: "iridium", data: nil)) + relay: RelayProtocolOptions(protocol: "irn", data: nil)) let uriString = inputURI.absoluteString let outputURI = WalletConnectURI(string: uriString) XCTAssertEqual(inputURI, outputURI)