Merge pull request #730 from WalletConnect/develop

1.4.1
WalletConnect · Feb 21, 2023 · 623f734 · 623f734
2 parents dd68f76 + 2146f0a
commit 623f734
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Sources/JSONRPC/RPCID.swift b/Sources/JSONRPC/RPCID.swift
@@ -9,8 +9,8 @@ public protocol IdentifierGenerator {
 struct IntIdentifierGenerator: IdentifierGenerator {
 
     func next() -> RPCID {
-        let timestamp = Int64(Date().timeIntervalSince1970 * 1000 * pow(10, 6))
-        let random = Int64.random(in: 0..<1000000)
+        let timestamp = Int64(Date().timeIntervalSince1970 * 1000) * 1000
+        let random = Int64.random(in: 0..<1000)
         return RPCID(timestamp + random)
     }
 }
@@ -37,7 +37,7 @@ extension RPCID {
 
     public var timestamp: Date {
         guard let id = self.right else { return .distantPast }
-        let interval = TimeInterval(id / 1000 / 1000000)
+        let interval = TimeInterval(id / 1000 / 1000)
         return Date(timeIntervalSince1970: interval)
     }
 }
diff --git a/Sources/WalletConnectRelay/RPC/WalletConnectRPCID.swift b/Sources/WalletConnectRelay/RPC/WalletConnectRPCID.swift
@@ -3,8 +3,8 @@ import Foundation
 struct WalletConnectRPCID: IdentifierGenerator {
 
     func next() -> RPCID {
-        let timestamp = Int64(Date().timeIntervalSince1970 * 1000 * pow(10, 6))
-        let random = Int64.random(in: 0..<1000000)
+        let timestamp = Int64(Date().timeIntervalSince1970 * 1000) * 1000
+        let random = Int64.random(in: 0..<1000)
         return .right(Int64(timestamp + random))
     }
 }
diff --git a/Sources/WalletConnectUtils/JsonRecID.swift b/Sources/WalletConnectUtils/JsonRecID.swift
@@ -3,13 +3,13 @@ import Foundation
 public struct JsonRpcID {
 
     public static func generate() -> Int64 {
-        let timestamp = Int64(Date().timeIntervalSince1970 * 1000 * pow(10, 6))
-        let random = Int64.random(in: 0..<1000000)
+        let timestamp = Int64(Date().timeIntervalSince1970 * 1000) * 1000
+        let random = Int64.random(in: 0..<1000)
         return timestamp + random
     }
 
     public static func timestamp(from id: Int64) -> Date {
-        let interval = TimeInterval(id / 1000 / 1000000)
+        let interval = TimeInterval(id / 1000 / 1000)
         return Date(timeIntervalSince1970: interval)
     }
 }
diff --git a/Tests/WalletConnectSignTests/WCResponseTests.swift b/Tests/WalletConnectSignTests/WCResponseTests.swift
@@ -7,7 +7,7 @@ final class RPCIDTests: XCTestCase {
     func testTimestamp() {
         let request = RPCRequest(method: "method")
         let response = RPCResponse(matchingRequest: request, error: JSONRPCError(code: 0, message: "message"))
-        let timestamp = Date(timeIntervalSince1970: TimeInterval(request.id!.right! / 1000 / 1000000))
+        let timestamp = Date(timeIntervalSince1970: TimeInterval(request.id!.right! / 1000 / 1000))
 
         XCTAssertEqual(response.id!.timestamp, timestamp)
         XCTAssertTrue(Calendar.current.isDateInToday(response.id!.timestamp))