Merge pull request #1260 from o1-labs/fix/ts-build-rot

Fix TS build and Mina tests
o1-labs · Nov 21, 2023 · 3e2103d · 3e2103d
2 parents 084a1e7 + 2fefe98
commit 3e2103d
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 28 deletions.
diff --git a/run-minimal-mina-tests.sh b/run-minimal-mina-tests.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
 set -e
 
+npm run dev
+
 ./run src/tests/inductive-proofs-small.ts --bundle
diff --git a/src/bindings b/src/bindings
diff --git a/src/lib/gadgets/bitwise.ts b/src/lib/gadgets/bitwise.ts
@@ -212,7 +212,7 @@ function rotate(
       field.toBigInt() < 2n ** BigInt(MAX_BITS),
       `rotation: expected field to be at most 64 bits, got ${field.toBigInt()}`
     );
-    return new Field(Fp.rot(field.toBigInt(), bits, direction));
+    return new Field(Fp.rot(field.toBigInt(), BigInt(bits), direction));
   }
   const [rotated] = rot(field, bits, direction);
   return rotated;

diff --git a/src/lib/gadgets/bitwise.unit-test.ts b/src/lib/gadgets/bitwise.unit-test.ts
@@ -103,7 +103,7 @@ await Bitwise.compile();
 
 [2, 4, 8, 16, 32, 64].forEach((length) => {
   equivalent({ from: [uint(length)], to: field })(
-    (x) => Fp.rot(x, 12, 'left'),
+    (x) => Fp.rot(x, 12n, 'left'),
     (x) => Gadgets.rotate(x, 12, 'left')
   );
   equivalent({ from: [uint(length)], to: field })(
@@ -164,7 +164,7 @@ await equivalentAsync(
 await equivalentAsync({ from: [field], to: field }, { runs: 3 })(
   (x) => {
     if (x >= 2n ** 64n) throw Error('Does not fit into 64 bits');
-    return Fp.rot(x, 12, 'left');
+    return Fp.rot(x, 12n, 'left');
   },
   async (x) => {
     let proof = await Bitwise.rot(x);

diff --git a/src/tests/inductive-proofs-small.ts b/src/tests/inductive-proofs-small.ts
@@ -1,15 +1,6 @@
-import {
-  SelfProof,
-  Field,
-  ZkProgram,
-  isReady,
-  shutdown,
-  Proof,
-} from '../index.js';
+import { SelfProof, Field, ZkProgram, Proof } from 'o1js';
 import { tic, toc } from '../examples/utils/tic-toc.node.js';
 
-await isReady;
-
 let MaxProofsVerifiedOne = ZkProgram({
   name: 'recursive-1',
   publicInput: Field,
@@ -85,5 +76,3 @@ function testJsonRoundtrip(ProofClass: any, proof: Proof<Field, void>) {
   );
   return ProofClass.fromJSON(jsonProof);
 }
-
-shutdown();
diff --git a/src/tests/inductive-proofs.ts b/src/tests/inductive-proofs.ts
@@ -1,15 +1,6 @@
-import {
-  SelfProof,
-  Field,
-  ZkProgram,
-  isReady,
-  shutdown,
-  Proof,
-} from '../index.js';
+import { SelfProof, Field, ZkProgram, Proof } from 'o1js';
 import { tic, toc } from '../examples/utils/tic-toc.node.js';
 
-await isReady;
-
 let MaxProofsVerifiedZero = ZkProgram({
   name: 'no-recursion',
   publicInput: Field,
@@ -155,5 +146,3 @@ function testJsonRoundtrip(ProofClass: any, proof: Proof<Field, void>) {
   );
   return ProofClass.fromJSON(jsonProof);
 }
-
-shutdown();