Defaulting to ZKP (#273)

* Defaulting to ZKP * Updating CI
21-DOT-DEV · Jan 1, 2023 · 661f67f · 661f67f
1 parent 18e35ff
commit 661f67f
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
-    - name: Build the Docker secp256k1 image
-      run: docker build .
     - name: Build the Docker zkp image
-      run: docker build -f Exhaustive/zkp/Dockerfile .
+      run: docker build .
+    - name: Build the Docker secp256k1 image
+      run: docker build -f Exhaustive/Package/Dockerfile .
diff --git a/Dockerfile b/Dockerfile
@@ -8,4 +8,4 @@ ADD . /LinuxTests
 WORKDIR /LinuxTests
 
 # Execute Linux test suite
-RUN swift test && swift build --target zkp --use-integrated-swift-driver
+RUN swift test && swift build --target secp256k1 --use-integrated-swift-driver
diff --git a/Exhaustive/zkp/Dockerfile → Exhaustive/Package/Dockerfile b/Exhaustive/zkp/Dockerfile → Exhaustive/Package/Dockerfile
diff --git a/Exhaustive/zkp/Package.swift → Exhaustive/Package/Package.swift b/Exhaustive/zkp/Package.swift → Exhaustive/Package/Package.swift
@@ -3,15 +3,15 @@
 import PackageDescription
 
 let package = Package(
-    name: "zkp",
+    name: "Package",
     dependencies: [
         .package(name: "secp256k1", path: "../..")
     ],
     targets: [
         .testTarget(
-            name: "zkpTests",
+            name: "secp256k1Tests",
             dependencies: [
-                .product(name: "zkp", package: "secp256k1")
+                .product(name: "secp256k1", package: "secp256k1")
             ]
         )
     ]

diff --git a/Exhaustive/zkp/README.md → Exhaustive/Package/README.md b/Exhaustive/zkp/README.md → Exhaustive/Package/README.md
diff --git a/Exhaustive/Package/Tests/secp256k1Tests/XCTestManifests.swift b/Exhaustive/Package/Tests/secp256k1Tests/XCTestManifests.swift
@@ -0,0 +1 @@
+../../../../Tests/zkpTests/XCTestManifests.swift
diff --git a/Exhaustive/Package/Tests/secp256k1Tests/secp256k1Tests.swift b/Exhaustive/Package/Tests/secp256k1Tests/secp256k1Tests.swift
@@ -0,0 +1 @@
+../../../../Tests/zkpTests/secp256k1Tests.swift
diff --git a/Exhaustive/zkp/Tests/zkpTests/XCTestManifests.swift b/Exhaustive/zkp/Tests/zkpTests/XCTestManifests.swift
diff --git a/Exhaustive/zkp/Tests/zkpTests/secp256k1Tests.swift b/Exhaustive/zkp/Tests/zkpTests/secp256k1Tests.swift
diff --git a/Package.swift b/Package.swift
@@ -84,9 +84,9 @@ let package = Package(
             ]
         ),
         .testTarget(
-            name: "secp256k1Tests",
+            name: "zkpTests",
             dependencies: [
-                "secp256k1"
+                "zkp"
             ]
         )
     ],

diff --git a/Tests/secp256k1Tests/XCTestManifests.swift → Tests/zkpTests/XCTestManifests.swift b/Tests/secp256k1Tests/XCTestManifests.swift → Tests/zkpTests/XCTestManifests.swift
diff --git a/Tests/secp256k1Tests/secp256k1Tests.swift → Tests/zkpTests/secp256k1Tests.swift b/Tests/secp256k1Tests/secp256k1Tests.swift → Tests/zkpTests/secp256k1Tests.swift
@@ -1,7 +1,7 @@
-#if canImport(secp256k1)
-    @testable import secp256k1
-#else
+#if canImport(zkp)
     @testable import zkp
+#else
+    @testable import secp256k1
 #endif
 
 import XCTest

diff --git a/Exhaustive/zkp/Tests/zkpTests/zkpTests.swift → Tests/zkpTests/zkpTests.swift b/Exhaustive/zkp/Tests/zkpTests/zkpTests.swift → Tests/zkpTests/zkpTests.swift
diff --git a/bitrise.yml b/bitrise.yml
@@ -27,4 +27,4 @@ workflows:
             # fail if any commands fails; debug log
             set -ex
 
-            swift test --package-path Exhaustive/zkp --use-integrated-swift-driver
+            swift test --package-path Exhaustive/Package --use-integrated-swift-driver