fix ci

Author: tilo-14

.github/workflows/rust-tests.yml

@@ -29,9 +29,6 @@ jobs:
           - counter/native
           - counter/pinocchio
           - account-comparison
-          - zk/zk-id
-          - zk/zk-nullifier
-          - zk/zk-merkle-proof
           - airdrop-implementations/simple-claim/program
         include:
           - example: basic-operations/native
@@ -53,12 +50,6 @@ jobs:
           example: ${{ matrix.example }}
           solana-cli-version: ${{ env.SOLANA_CLI_VERSION }}
           rust-toolchain: ${{ env.RUST_TOOLCHAIN }}
-          install-circom: ${{ startsWith(matrix.example, 'zk/') || startsWith(matrix.example, 'zk/') }}
-
-      - name: Setup ZK circuits
-        if: startsWith(matrix.example, 'zk/') || startsWith(matrix.example, 'zk/')
-        working-directory: ${{ matrix.example }}
-        run: ./scripts/setup.sh
 
       - name: Build and test
         working-directory: ${{ matrix.example }}

.github/workflows/typescript-tests.yml

@@ -34,6 +34,8 @@ jobs:
           - basic-operations/anchor/update
           - basic-operations/anchor/close
           - basic-operations/anchor/reinit
+          - zk/zk-id
+          - zk/nullifier
     steps:
       - uses: actions/checkout@v4
 
@@ -45,6 +47,12 @@ jobs:
           solana-cli-version: ${{ env.SOLANA_CLI_VERSION }}
           rust-toolchain: ${{ env.RUST_TOOLCHAIN }}
           photon-indexer: "true"
+          install-circom: ${{ matrix.example == 'zk/zk-id' }}
+
+      - name: Setup ZK circuits
+        if: matrix.example == 'zk/zk-id'
+        working-directory: ${{ matrix.example }}
+        run: ./scripts/setup.sh
 
       - name: Install dependencies
         working-directory: ${{ matrix.example }}
@@ -69,49 +77,3 @@ jobs:
       - name: Run TypeScript tests
         working-directory: ${{ matrix.example }}
         run: anchor test --skip-local-validator --skip-build --skip-deploy
-
-  test-zk:
-    name: ZK ${{ matrix.example }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        example:
-          - zk/zk-id
-          - zk/zk-nullifier
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup environment
-        uses: ./.github/actions/setup
-        with:
-          example: ${{ matrix.example }}
-          node-version: ${{ env.NODE_VERSION }}
-          solana-cli-version: ${{ env.SOLANA_CLI_VERSION }}
-          rust-toolchain: ${{ env.RUST_TOOLCHAIN }}
-          photon-indexer: "true"
-          install-circom: "true"
-
-      - name: Setup ZK circuits
-        working-directory: ${{ matrix.example }}
-        run: ./scripts/setup.sh
-
-      - name: Install dependencies
-        working-directory: ${{ matrix.example }}
-        run: npm install
-
-      - name: Build program
-        working-directory: ${{ matrix.example }}
-        run: cargo build-sbf
-
-      - name: Start test validator
-        working-directory: ${{ matrix.example }}
-        run: |
-          PROGRAM_NAME=$(grep -A 10 '\[programs.localnet\]' Anchor.toml | grep '=' | head -1 | cut -d' ' -f1)
-          PROGRAM_ID=$(grep -A 10 '\[programs.localnet\]' Anchor.toml | grep '=' | head -1 | sed 's/.*"\(.*\)".*/\1/')
-          light test-validator --sbf-program "$PROGRAM_ID" ./target/deploy/${PROGRAM_NAME}.so &
-          sleep 10
-
-      - name: Run TypeScript tests
-        working-directory: ${{ matrix.example }}
-        run: npm run test:ts

zk/nullifier/Anchor.toml

@@ -16,5 +16,5 @@ cluster = "localnet"
 wallet = "~/.config/solana/id.json"
 
 [scripts]
-test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
+test = "npm run test"
 

zk/nullifier/package.json

@@ -6,7 +6,8 @@
     "setup": "./scripts/setup.sh",
     "clean": "./scripts/clean.sh",
     "compile": "circom circuits/nullifier.circom --r1cs --wasm --sym -o build",
-    "test:ts": "ts-mocha -p ./tsconfig.json -t 1000000 ts-tests/*.test.ts"
+    "test:ts": "ts-mocha -p ./tsconfig.json -t 1000000 ts-tests/*.test.ts",
+    "test": "ts-mocha -p ./tsconfig.json -t 1000000 ts-tests/*.test.ts"
   },
   "dependencies": {
     "circomlib": "2.0.5",

zk/zk-id/Anchor.toml

@@ -16,4 +16,4 @@ cluster = "localnet"
 wallet = "~/.config/solana/id.json"
 
 [scripts]
-test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
+test = "npm run test"

zk/zk-id/package.json

@@ -10,7 +10,8 @@
     "generate-zkey": "snarkjs groth16 setup build/compressed_account_merkle_proof.r1cs pot/powersOfTau28_hez_final_16.ptau build/circuit_0000.zkey",
     "contribute": "snarkjs zkey contribute build/circuit_0000.zkey build/circuit_final.zkey --name='First contribution' -v",
     "export-vkey": "snarkjs zkey export verificationkey build/circuit_final.zkey build/verification_key.json",
-    "test:ts": "ts-mocha -p ./tsconfig.json -t 1000000 ts-tests/*.test.ts"
+    "test:ts": "ts-mocha -p ./tsconfig.json -t 1000000 ts-tests/*.test.ts",
+    "test": "ts-mocha -p ./tsconfig.json -t 1000000 ts-tests/*.test.ts"
   },
   "dependencies": {
     "@coral-xyz/borsh": "^0.30.1",