Merge pull request #21 from tkey/fix_naming

Fix naming
tkey · Feb 1, 2024 · a744a76 · a744a76
2 parents e2ab8ad + 8e995c2
commit a744a76
Show file tree

Hide file tree

Showing 62 changed files with 124 additions and 119 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -2,7 +2,6 @@ on:
   push:
     branches:
       - main
-      - alpha
   pull_request:
     types:
       - opened
@@ -20,4 +19,4 @@ jobs:
         with:
           xcode-version: "14.2.0"
       - name: package
-        run: xcodebuild test -scheme tkey_pkg -destination "platform=iOS Simulator,OS=16.2,name=iPhone 14" COMPILER_INDEX_STORE_ENABLE=NO
+        run: xcodebuild test -scheme tkey-mpc-swift -destination "platform=iOS Simulator,OS=16.2,name=iPhone 14" COMPILER_INDEX_STORE_ENABLE=NO
diff --git a/Package.swift b/Package.swift
@@ -4,20 +4,20 @@
 import PackageDescription
 
 let package = Package(
-    name: "tkey_pkg",
+    name: "tkey-mpc-swift",
     platforms: [
-        .iOS(SupportedPlatform.IOSVersion.v14),
+        .iOS(.v13), .macOS(.v10_15)
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
-            name: "ThresholdKey",
-            targets: ["tkey-pkg"]),
+            name: "tkey-mpc-swift",
+            targets: ["tkey-mpc-swift"]),
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
-        .package(name: "TorusUtils", url: "https://github.com/torusresearch/torus-utils-swift" , from: "6.1.0"),
+        .package(name: "TorusUtils", url: "https://github.com/torusresearch/torus-utils-swift" , from: "7.0.0"),
         // dev dependencies only
         .package(name:"CryptoSwift", url: "https://github.com/krzyzanowskim/CryptoSwift.git",from: "1.5.1"),
         .package(name:"jwt-kit", url: "https://github.com/vapor/jwt-kit.git", from: "4.0.0"),
@@ -28,18 +28,18 @@ let package = Package(
         .binaryTarget(name: "libtkey",
                       path: "Sources/libtkey/libtkey.xcframework"
         ),
-        .target(name: "lib",
+        .target(name: "tkey",
                dependencies: ["libtkey"],
                 path: "Sources/libtkey"
         ),
         .target(
-            name: "tkey-pkg",
-            dependencies: ["lib", "TorusUtils"],
+            name: "tkey-mpc-swift",
+            dependencies: ["tkey", "TorusUtils"],
             path: "Sources/ThresholdKey"
         ),
         .testTarget(
             name: "tkey-pkgTests",
-            dependencies: ["tkey-pkg", "CryptoSwift", .product(name: "JWTKit", package: "jwt-kit")],
+            dependencies: ["tkey-mpc-swift", "CryptoSwift", .product(name: "JWTKit", package: "jwt-kit")],
             path: "Tests/tkeypkgTests"
         ),
     ]

diff --git a/Sources/ThresholdKey/Common/KeyPoint.swift b/Sources/ThresholdKey/Common/KeyPoint.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 
@@ -150,7 +150,7 @@ public final class KeyPoint: Equatable {
             key_point_encode(pointer, encoder_format, error)
         })
         guard errorCode == 0 else {
-            throw RuntimeError("Error in KeyPoint, getAsCompressedPublicKey")
+            throw RuntimeError("Error in KeyPoint, getPublicKey")
             }
         let compressed = String.init(cString: result!)
         string_free(result)

diff --git a/Sources/ThresholdKey/Common/NodeDetails.swift b/Sources/ThresholdKey/Common/NodeDetails.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-import lib
+#if canImport(tkey)
+import tkey
 #endif
 
 public final class NodeDetails {

diff --git a/Sources/ThresholdKey/Common/PrivateKey.swift b/Sources/ThresholdKey/Common/PrivateKey.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public final class PrivateKey {

diff --git a/Sources/ThresholdKey/Common/ShareStore.swift b/Sources/ThresholdKey/Common/ShareStore.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public final class ShareStore {

diff --git a/Sources/ThresholdKey/Common/TssOptions.swift b/Sources/ThresholdKey/Common/TssOptions.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-import lib
+#if canImport(tkey)
+import tkey
 #endif
 
 public final class TssOptions {

diff --git a/Sources/ThresholdKey/GenerateShareStoreResult.swift b/Sources/ThresholdKey/GenerateShareStoreResult.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public final class GenerateShareStoreResult {

diff --git a/Sources/ThresholdKey/KeyDetails.swift b/Sources/ThresholdKey/KeyDetails.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public final class KeyDetails {

diff --git a/Sources/ThresholdKey/KeyPointArray.swift b/Sources/ThresholdKey/KeyPointArray.swift
@@ -1,7 +1,7 @@
 import Foundation
 
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public class KeyPointArray {

diff --git a/Sources/ThresholdKey/KeyReconstructionDetails.swift b/Sources/ThresholdKey/KeyReconstructionDetails.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public final class KeyReconstructionDetails: Codable {

diff --git a/Sources/ThresholdKey/LocalMetadataTransitions.swift b/Sources/ThresholdKey/LocalMetadataTransitions.swift
@@ -1,7 +1,7 @@
 import Foundation
 
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public final class LocalMetadataTransitions {

diff --git a/Sources/ThresholdKey/Metadata.swift b/Sources/ThresholdKey/Metadata.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public final class Metadata {

diff --git a/Sources/ThresholdKey/Modules/PrivateKeysModule.swift b/Sources/ThresholdKey/Modules/PrivateKeysModule.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public struct KeyData: Decodable {

diff --git a/Sources/ThresholdKey/Modules/SecurityQuestionModule.swift b/Sources/ThresholdKey/Modules/SecurityQuestionModule.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public final class SecurityQuestionModule {

diff --git a/Sources/ThresholdKey/Modules/SeedPhraseModule.swift b/Sources/ThresholdKey/Modules/SeedPhraseModule.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public struct SeedPhrase: Codable {

diff --git a/Sources/ThresholdKey/Modules/ShareSerializationModule.swift b/Sources/ThresholdKey/Modules/ShareSerializationModule.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public final class ShareSerializationModule {

diff --git a/Sources/ThresholdKey/Modules/ShareTransferModule.swift b/Sources/ThresholdKey/Modules/ShareTransferModule.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public final class ShareTransferModule {

diff --git a/Sources/ThresholdKey/Modules/TssModule.swift b/Sources/ThresholdKey/Modules/TssModule.swift
@@ -1,8 +1,8 @@
 import Foundation
 
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 import CommonSources
 import FetchNodeDetails

diff --git a/Sources/ThresholdKey/Polynomial.swift b/Sources/ThresholdKey/Polynomial.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-import lib
+#if canImport(tkey)
+import tkey
 #endif
 
 public final class Polynomial {

diff --git a/Sources/ThresholdKey/PublicPolynomial.swift b/Sources/ThresholdKey/PublicPolynomial.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-import lib
+#if canImport(tkey)
+import tkey
 #endif
 
 public final class PublicPolynomial {

diff --git a/Sources/ThresholdKey/RssComm.swift b/Sources/ThresholdKey/RssComm.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-import lib
+#if canImport(tkey)
+import tkey
 #endif
 
 public final class RssComm {

diff --git a/Sources/ThresholdKey/ServiceProvider.swift b/Sources/ThresholdKey/ServiceProvider.swift
@@ -1,7 +1,7 @@
 import Foundation
 import TorusUtils
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 import FetchNodeDetails
 import CommonSources

diff --git a/Sources/ThresholdKey/ShareMap.swift b/Sources/ThresholdKey/ShareMap.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public final class ShareMap {

diff --git a/Sources/ThresholdKey/ShareStoreArray.swift b/Sources/ThresholdKey/ShareStoreArray.swift
@@ -1,7 +1,7 @@
 import Foundation
 
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public class ShareStoreArray {

diff --git a/Sources/ThresholdKey/ShareStoreMap.swift b/Sources/ThresholdKey/ShareStoreMap.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public final class ShareStoreMap {

diff --git a/Sources/ThresholdKey/ShareStorePolyIdIndexMap.swift b/Sources/ThresholdKey/ShareStorePolyIdIndexMap.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public final class ShareStorePolyIdIndexMap {

diff --git a/Sources/ThresholdKey/ShareTransferStore.swift b/Sources/ThresholdKey/ShareTransferStore.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif
 
 public final class ShareTransferStore {

diff --git a/Sources/ThresholdKey/StorageLayer.swift b/Sources/ThresholdKey/StorageLayer.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(lib)
-    import lib
+#if canImport(tkey)
+    import tkey
 #endif