renamed class

torusresearch · Apr 29, 2020 · 198e4e8 · 198e4e8
1 parent b3d45a5
commit 198e4e8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Sources/torus-utils-swift/Extensions/torus+extension.swift b/Sources/torus-utils-swift/Extensions/torus+extension.swift
@@ -11,7 +11,7 @@ import PromiseKit
 import secp256k1
 import PMKFoundation
 
-extension Torus {
+extension TorusUtils {
 
     func makeUrlRequest(url: String) throws -> URLRequest {
         var rq = URLRequest(url: URL(string: url)!)
@@ -42,7 +42,7 @@ extension Torus {
         let result = privateKey.withUnsafeBytes { (a: UnsafeRawBufferPointer) -> Int32? in
             if let pkRawPointer = a.baseAddress, a.count > 0 {
                 let privateKeyPointer = pkRawPointer.assumingMemoryBound(to: UInt8.self)
-                let res = secp256k1_ec_pubkey_tweak_mul(Torus.context!, UnsafeMutablePointer<secp256k1_pubkey>(&pubKey2), privateKeyPointer)
+                let res = secp256k1_ec_pubkey_tweak_mul(TorusUtils.context!, UnsafeMutablePointer<secp256k1_pubkey>(&pubKey2), privateKeyPointer)
                 return res
             } else {
                 return nil
@@ -166,7 +166,7 @@ extension Torus {
         let result = privateKey.withUnsafeBytes { (a: UnsafeRawBufferPointer) -> Int32? in
             if let pkRawPointer = a.baseAddress, a.count > 0 {
                 let privateKeyPointer = pkRawPointer.assumingMemoryBound(to: UInt8.self)
-                let res = secp256k1_ec_pubkey_create(Torus.context!, UnsafeMutablePointer<secp256k1_pubkey>(&publicKey), privateKeyPointer)
+                let res = secp256k1_ec_pubkey_create(TorusUtils.context!, UnsafeMutablePointer<secp256k1_pubkey>(&publicKey), privateKeyPointer)
                 return res
             } else {
                 return nil

diff --git a/Sources/torus-utils-swift/torus.swift → Sources/torus-utils-swift/TorusUtils.swift b/Sources/torus-utils-swift/torus.swift → Sources/torus-utils-swift/TorusUtils.swift
@@ -13,7 +13,7 @@ import CryptoSwift
 import BigInt
 
 
-public class Torus{
+public class TorusUtils{
     public var torusUtils : utils = utils()
     static let context = secp256k1_context_create(UInt32(SECP256K1_CONTEXT_SIGN|SECP256K1_CONTEXT_VERIFY))
     var privateKey = ""
@@ -315,7 +315,7 @@ public class Torus{
         var nodeReturnedPubKeyX:String = ""
         var nodeReturnedPubKeyY:String = ""
 
-        print(privateKey?.toHexString(), publicKeyHex, pubKeyX, pubKeyY, tokenCommitment)
+        print(privateKey?.toHexString() as Any, publicKeyHex as Any, pubKeyX as Any, pubKeyY as Any, tokenCommitment)
 
         commitmentRequest(endpoints: endpoints, verifier: verifier, pubKeyX: pubKeyX!, pubKeyY: pubKeyY!, timestamp: timestamp, tokenCommitment: tokenCommitment)
             .then{ data -> Promise<[Int:[String:String]]> in

diff --git a/Tests/torus-utils-swiftTests/unit_test.swift b/Tests/torus-utils-swiftTests/unit_test.swift
@@ -34,7 +34,7 @@ final class torus_utils_swiftTests: XCTestCase {
     }
 
     func testKeyLookup() {
-        let obj = Torus()
+        let obj = TorusUtils()
 
         let exp1 = XCTestExpectation(description: "Do keylookup with success")
         let keyLookupSuccess = obj.keyLookup(endpoints: nodeList, verifier: self.verifier, verifierId: self.verifierId)
@@ -59,7 +59,7 @@ final class torus_utils_swiftTests: XCTestCase {
 
     func testKeyAssign(){
         let exp1 = XCTestExpectation(description: "Do keyAssign success")
-        let obj = Torus()
+        let obj = TorusUtils()
         let keyAssign = obj.keyAssign(endpoints: self.nodeList, torusNodePubs: nodePubKeys, verifier: verifier, verifierId: self.verifierId)
         keyAssign.done{ data in
             XCTAssertNotNil(data)
@@ -72,7 +72,7 @@ final class torus_utils_swiftTests: XCTestCase {
 
     func testGetPublicAddress(){
         let exp1 = XCTestExpectation(description: "testing get public address")
-        let obj = Torus()
+        let obj = TorusUtils()
         let getpublicaddress = obj.getPublicAddress(endpoints: self.nodeList, torusNodePubs: nodePubKeys, verifier: "google", verifierId: self.verifierId, isExtended: true)
         getpublicaddress.done{ data in
             print("data", data)