Merge devdeps: should, bmark into jsbt

Author: paulmillr

test/acvp.test.ts

@@ -1,7 +1,7 @@
 import { sha1 } from '@noble/hashes/legacy.js';
 import { sha224, sha256, sha384, sha512, sha512_224, sha512_256 } from '@noble/hashes/sha2.js';
 import { sha3_224, sha3_256, sha3_384, sha3_512 } from '@noble/hashes/sha3.js';
-import { describe, should } from 'micro-should';
+import { describe, should } from '@paulmillr/jsbt/test.js';
 import { deepStrictEqual as eql } from 'node:assert';
 import { ecdsa } from '../src/abstract/weierstrass.ts';
 import { ed25519, ed25519ctx, ed25519ph } from '../src/ed25519.ts';

test/basic.test.ts

@@ -1,5 +1,5 @@
 import { sha256 } from '@noble/hashes/sha2.js';
-import { describe, should } from 'micro-should';
+import { describe, should } from '@paulmillr/jsbt/test.js';
 import { deepStrictEqual as eql, notDeepStrictEqual, throws } from 'node:assert';
 import { Field } from '../src/abstract/modular.ts';
 import { ecdsa, weierstrass } from '../src/abstract/weierstrass.ts';

test/benchmark/bls.ts

@@ -1,5 +1,5 @@
 import { hexToBytes } from '@noble/hashes/utils.js';
-import bench from 'micro-bmark';
+import bench from '@paulmillr/jsbt/bench.js';
 import { readFileSync } from 'node:fs';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -21,7 +21,7 @@ const G2_VECTORS = readFileSync(
   let p1, p2, sig, sig_s;
   const blsl = bls.longSignatures;
   const blss = bls.shortSignatures;
-  await bench('init', 1, () => {
+  await bench('init', () => {
     p1 =
       bls.G1.Point.BASE.multiply(
         0x28b90deaf189015d3a325908c5e0e4bf00f84f7e639b056ff82d7e70b6eede4cn
@@ -31,7 +31,7 @@ const G2_VECTORS = readFileSync(
         0x28b90deaf189015d3a325908c5e0e4bf00f84f7e639b056ff82d7e70b6eede4dn
       );
     bls.pairing(p1, p2);
-  });
+  }, 1);
   const priv = hexToBytes('28b90deaf189015d3a325908c5e0e4bf00f84f7e639b056ff82d7e70b6eede4c');
   sig = blsl.sign(blsl.hash(Uint8Array.of(0x09)), priv);
   sig_s = blss.sign(blss.hash(Uint8Array.of(0x09)), priv);
@@ -74,9 +74,9 @@ const G2_VECTORS = readFileSync(
   let pointsG2;
 
   console.log('# misc');
-  await bench(`initializing ${amount} G1 points`, 1, () => {
+  await bench(`initializing ${amount} G1 points`, () => {
     pointsG1 = scalars1.map((s) => bls.G1.Point.BASE.multiply(s));
-  });
+  }, 1);
   await bench(`MSM pippenger x${amount}`, () => {
     pippenger(bls.G1.Point, pointsG1, scalars2);
   });
@@ -97,9 +97,9 @@ const G2_VECTORS = readFileSync(
   await bench('agg G2 x512', () => blsl.aggregateSignatures(sig512));
   await bench('agg G2 x2048', () => blsl.aggregateSignatures(sig2048));
 
-  await bench('initializing 4096 G2 points', 1, () => {
+  await bench('initializing 4096 G2 points', () => {
     pointsG2 = scalars1.slice(0, 4096).map((s) => bls.G2.Point.BASE.multiply(s));
-  });
+  }, 1);
   const pairingBatch = 10;
   await bench(`pairing${pairingBatch}`, () => {
     const res = [];

test/benchmark/curves.ts

@@ -1,5 +1,5 @@
 import { randomBytes } from '@noble/hashes/utils.js';
-import compare from 'micro-bmark/compare.js';
+import compare from '@paulmillr/jsbt/bench-compare.js';
 import { ed25519, ed25519_hasher, x25519 } from '../../src/ed25519.ts';
 import { ed448, ed448_hasher, x448 } from '../../src/ed448.ts';
 import { p256, p256_hasher, p384, p384_hasher, p521, p521_hasher } from '../../src/nist.ts';

test/benchmark/fft.ts

@@ -1,4 +1,4 @@
-import mark from 'micro-bmark';
+import mark from '@paulmillr/jsbt/bench.js';
 import * as fft from '../../src/abstract/fft.ts';
 import { bls12_381 } from '../../src/bls12-381.ts';
 import { title } from './_shared.ts';

test/benchmark/secp256k1.ts

@@ -1,10 +1,10 @@
-import mark from 'micro-bmark';
+import mark from '@paulmillr/jsbt/bench.js';
 import { schnorr, secp256k1 } from '../../src/secp256k1.ts';
 import { generateData, title } from './_shared.ts';
 
 (async () => {
   title('secp256k1');
-  await mark('init', 1, () => secp256k1.Point.BASE.precompute(8, false));
+  await mark('init', () => secp256k1.Point.BASE.precompute(8, false), 1);
   const d = generateData(secp256k1);
   await mark('getPublicKey', () => secp256k1.getPublicKey(d.priv));
   await mark('sign', () => secp256k1.sign(d.msg, d.priv));

test/benchmark/utils.ts

@@ -1,7 +1,7 @@
 import { sha256, sha512 } from '@noble/hashes/sha2.js';
 import { shake256 } from '@noble/hashes/sha3.js';
 import { randomBytes } from '@noble/hashes/utils.js';
-import mark from 'micro-bmark';
+import mark from '@paulmillr/jsbt/bench.js';
 import { hash_to_field } from '../../src/abstract/hash-to-curve.ts';
 import * as md from '../../src/abstract/modular.ts';
 import { ed25519, ristretto255, ristretto255_hasher } from '../../src/ed25519.ts';
@@ -62,7 +62,7 @@ const DecafPoint = decaf448.Point;
   await mark('multiply', () => RistrettoPoint.BASE.multiply(priv));
   await mark('encode', () => RistrettoPoint.BASE.toBytes());
   await mark('decode', () => RistrettoPoint.fromBytes(encoded));
-  await mark('ristretto255_hasher', 1000, () =>
+  await mark('ristretto255_hasher', () =>
     ristretto255_hasher.hashToCurve(msg, { DST: 'ristretto255_XMD:SHA-512_R255MAP_RO_' })
   );
 

test/bls12-381.test.ts

@@ -1,5 +1,5 @@
 import * as fc from 'fast-check';
-import { describe, should } from 'micro-should';
+import { describe, should } from '@paulmillr/jsbt/test.js';
 import { deepStrictEqual as eql, throws } from 'node:assert';
 import { wNAF } from '../src/abstract/curve.ts';
 import { hash_to_field } from '../src/abstract/hash-to-curve.ts';

test/bn254.test.ts

@@ -1,5 +1,5 @@
 import { hexToBytes } from '@noble/hashes/utils.js';
-import { describe, should } from 'micro-should';
+import { describe, should } from '@paulmillr/jsbt/test.js';
 import { deepStrictEqual as eql, throws } from 'node:assert';
 import { bn254 } from '../src/bn254.ts';
 import { bytesToNumberBE } from '../src/utils.ts';

test/ecdsa.test.ts

@@ -10,7 +10,7 @@ import {
   turboshake256,
 } from '@noble/hashes/sha3-addons.js';
 import { sha3_224, sha3_256, sha3_384, sha3_512, shake128, shake256 } from '@noble/hashes/sha3.js';
-import { describe, should } from 'micro-should';
+import { describe, should } from '@paulmillr/jsbt/test.js';
 import { deepStrictEqual as eql, throws } from 'node:assert';
 import { randomBytes } from 'node:crypto';
 import { ecdh, ecdsa } from '../src/abstract/weierstrass.ts';