Increase test timeout for CI

Author: thibmeu

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [22, 18]
+        node: [22, 20]
     steps:
       - name: Checking out
         uses: actions/checkout@v4

package.json

@@ -25,7 +25,7 @@
     "homepage": "https://github.com/cloudflare/blindrsa-ts#readme",
     "repository": "github:cloudflare/blindrsa-ts",
     "engines": {
-        "node": ">=18"
+        "node": ">=22"
     },
     "scripts": {
         "build": "tsc -b && cp src/sjcl/index.d.ts lib/src/sjcl/index.d.ts",
@@ -42,7 +42,7 @@
     "devDependencies": {
         "@eslint/js": "9.11.1",
         "@types/benchmark": "2.1.5",
-        "@vitest/coverage-v8": "^3.0.7",
+        "@vitest/coverage-v8": "3.0.7",
         "benchmark": "2.1.4",
         "eslint": "9.11.1",
         "eslint-config-prettier": "9.1.0",

test/blindrsa.test.ts

@@ -134,32 +134,28 @@ describe.each(vectors)('TestVectors', (v: Vector) => {
     const params = [undefined, { supportsRSARAW: true }];
 
     describe.each(params)(`_${v.name}`, (params) => {
-        test(
-            `supportsRSARAW/${params ? params.supportsRSARAW : false}`,
-            async () => {
-                const blindRSA = getSuiteByName(BlindRSA, v.name, params);
-                expect(blindRSA.toString()).toBe(v.name);
+        test(`supportsRSARAW/${params ? params.supportsRSARAW : false}`, async () => {
+            const blindRSA = getSuiteByName(BlindRSA, v.name, params);
+            expect(blindRSA.toString()).toBe(v.name);
 
-                const msg = hexToUint8(v.msg);
-                const inputMsg = blindRSA.prepare(msg);
-                expect(uint8ToHex(inputMsg)).toBe(v.input_msg);
+            const msg = hexToUint8(v.msg);
+            const inputMsg = blindRSA.prepare(msg);
+            expect(uint8ToHex(inputMsg)).toBe(v.input_msg);
 
-                const { publicKey, privateKey } = await keysFromVector(v, true);
+            const { publicKey, privateKey } = await keysFromVector(v, true);
 
-                const { blindedMsg, inv } = await blindRSA.blind(publicKey, inputMsg);
-                expect(uint8ToHex(blindedMsg)).toBe(v.blinded_msg);
-                expect(uint8ToHex(inv)).toBe(v.inv.slice(2));
+            const { blindedMsg, inv } = await blindRSA.blind(publicKey, inputMsg);
+            expect(uint8ToHex(blindedMsg)).toBe(v.blinded_msg);
+            expect(uint8ToHex(inv)).toBe(v.inv.slice(2));
 
-                const blindedSig = await blindRSA.blindSign(privateKey, blindedMsg);
-                expect(uint8ToHex(blindedSig)).toBe(v.blind_sig);
+            const blindedSig = await blindRSA.blindSign(privateKey, blindedMsg);
+            expect(uint8ToHex(blindedSig)).toBe(v.blind_sig);
 
-                const signature = await blindRSA.finalize(publicKey, inputMsg, blindedSig, inv);
-                expect(uint8ToHex(signature)).toBe(v.sig);
+            const signature = await blindRSA.finalize(publicKey, inputMsg, blindedSig, inv);
+            expect(uint8ToHex(signature)).toBe(v.sig);
 
-                const isValid = await blindRSA.verify(publicKey, signature, inputMsg);
-                expect(isValid).toBe(true);
-            },
-            20 * 1000,
-        );
+            const isValid = await blindRSA.verify(publicKey, signature, inputMsg);
+            expect(isValid).toBe(true);
+        }, 300_000);
     });
 });

test/partially_blindrsa.test.ts

@@ -124,11 +124,15 @@ describe.each(vectors)('Errors-vec$#', (v: Vector) => {
     });
 });
 
-test.each(vectors)('TestVector_$#/safePrimes', (v: Vector) => {
-    prepare_sjcl_random_generator();
-    expect(isSafePrime(new sjcl.bn(v.p))).toBe(true);
-    expect(isSafePrime(new sjcl.bn(v.q))).toBe(true);
-});
+test.each(vectors)(
+    'TestVector_$#/safePrimes',
+    (v: Vector) => {
+        prepare_sjcl_random_generator();
+        expect(isSafePrime(new sjcl.bn(v.p))).toBe(true);
+        expect(isSafePrime(new sjcl.bn(v.q))).toBe(true);
+    },
+    { timeout: 30_000 },
+);
 
 describe.each(vectors)('TestVector_$#', (v: Vector) => {
     beforeEach(() => {
@@ -146,37 +150,27 @@ describe.each(vectors)('TestVector_$#', (v: Vector) => {
     const all_params = [undefined, { supportsRSARAW: true }];
 
     describe.each(all_params)(`_${v.name}`, (params) => {
-        test(
-            `supportsRSARAW/${params ? params.supportsRSARAW : false}`,
-            async () => {
-                const blindRSA = getSuiteByName(PartiallyBlindRSA, v.name, params);
-                expect(blindRSA.toString()).toBe(v.name);
-
-                const msg = hexToUint8(v.msg);
-                const info = hexToUint8(v.info);
-                const inputMsg = blindRSA.prepare(msg);
-
-                const { publicKey, privateKey } = await keysFromVector(v, true);
-
-                const { blindedMsg, inv } = await blindRSA.blind(publicKey, inputMsg, info);
-                expect(uint8ToHex(blindedMsg)).toBe(v.blind_msg);
-
-                const blindedSig = await blindRSA.blindSign(privateKey, blindedMsg, info);
-                expect(uint8ToHex(blindedSig)).toBe(v.blind_sig);
-
-                const signature = await blindRSA.finalize(
-                    publicKey,
-                    inputMsg,
-                    info,
-                    blindedSig,
-                    inv,
-                );
-                expect(uint8ToHex(signature)).toBe(v.sig);
-
-                const isValid = await blindRSA.verify(publicKey, signature, inputMsg, info);
-                expect(isValid).toBe(true);
-            },
-            20 * 1000,
-        );
+        test(`supportsRSARAW/${params ? params.supportsRSARAW : false}`, async () => {
+            const blindRSA = getSuiteByName(PartiallyBlindRSA, v.name, params);
+            expect(blindRSA.toString()).toBe(v.name);
+
+            const msg = hexToUint8(v.msg);
+            const info = hexToUint8(v.info);
+            const inputMsg = blindRSA.prepare(msg);
+
+            const { publicKey, privateKey } = await keysFromVector(v, true);
+
+            const { blindedMsg, inv } = await blindRSA.blind(publicKey, inputMsg, info);
+            expect(uint8ToHex(blindedMsg)).toBe(v.blind_msg);
+
+            const blindedSig = await blindRSA.blindSign(privateKey, blindedMsg, info);
+            expect(uint8ToHex(blindedSig)).toBe(v.blind_sig);
+
+            const signature = await blindRSA.finalize(publicKey, inputMsg, info, blindedSig, inv);
+            expect(uint8ToHex(signature)).toBe(v.sig);
+
+            const isValid = await blindRSA.verify(publicKey, signature, inputMsg, info);
+            expect(isValid).toBe(true);
+        }, 300_000);
     });
 });

test/primes.test.ts

@@ -85,12 +85,16 @@ test.each([128, 256, 512, 1024])('generatePrime/%p', (bitLength) => {
     expect(isPrime(p)).toBe(true);
 });
 
-test.each([128, 256])('generateSafePrime/%p', (bitLength) => {
-    const p = generateSafePrime(bitLength);
+test.each([128, 256])(
+    'generateSafePrime/%p',
+    (bitLength) => {
+        const p = generateSafePrime(bitLength);
 
-    expect(p.bitLength()).toBeGreaterThanOrEqual(bitLength);
-    expect(isSafePrime(p)).toBe(true);
-});
+        expect(p.bitLength()).toBeGreaterThanOrEqual(bitLength);
+        expect(isSafePrime(p)).toBe(true);
+    },
+    300_000,
+);
 
 describe('max_num_iterations', () => {
     test('generatePrime', () => {
@@ -100,5 +104,5 @@ describe('max_num_iterations', () => {
         expect(() => {
             generatePrime(8);
         }).toThrow(/MAX_NUM_TRIES/);
-    });
+    }, 60_000);
 });

vitest.config.ts

@@ -2,8 +2,8 @@ import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
     test: {
-        setupFiles: ["./test/vitest.setup-file.ts"],
+        dir: './test',
+        setupFiles: ['./test/vitest.setup-file.ts'],
         coverage: { enabled: true },
-        testTimeout: 60_000 // the performance of generating safe primes in JS (without node) are terrible
     }
 })