Merge branch 'brian/nixify' into brian/permisions-precondition

o1-labs · Sep 17, 2024 · ce56eb2 · ce56eb2
2 parents 09590d3 + 9317da6
commit ce56eb2
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 18 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -31,7 +31,7 @@
                 ./src/bindings/ocaml/dune
                 ./src/bindings/ocaml/lib/dune
                 ./src/bindings/ocaml/dune-project
-                ./src/bindings/ocaml/js/dune
+                ./src/bindings/ocaml/jsoo_exports/dune
               ];
             });
           phases = [ "unpackPhase" "buildPhase" ];

diff --git a/run-jest-tests.sh b/run-jest-tests.sh
@@ -2,6 +2,13 @@
 set -e
 shopt -s globstar # to expand '**' into nested directories
 
+if ! [ -f ./mina-signer/dist ]
+then
+  pushd src/mina-signer
+    npm run build
+  popd
+fi
+
 for f in ./src/**/*.test.ts; do
   NODE_OPTIONS=--experimental-vm-modules npx jest $f;
 done
diff --git a/src/bindings b/src/bindings
diff --git a/src/lib/provable/string.ts b/src/lib/provable/string.ts
@@ -88,7 +88,7 @@ class CircuitString extends Struct(RawCircuitString) {
       let isNull = this.values[i].isNull();
       mask[i] = isNull.and(wasntNullAlready);
       wasntNullAlready = isNull.not().and(wasntNullAlready);
-      length.add(wasntNullAlready.toField());
+      length = length.add(wasntNullAlready.toField());
     }
     // mask has length n+1, the last element is true when `this` has no null char
     mask[n] = wasntNullAlready;

diff --git a/src/lib/provable/test/string.unit-test.ts b/src/lib/provable/test/string.unit-test.ts
@@ -150,6 +150,18 @@ describe('Circuit String', () => {
     });
   });
 
+  describe('#length', () => {
+    test('length', async () => {
+      const str1 = CircuitString.fromString('abcd');
+      expect(str1.length()).toEqual(Field(4));
+
+      await Provable.runAndCheck(() => {
+        const str1 = CircuitString.fromString('abcd');
+        expect(str1.length()).toEqual(Field(4));
+      });
+    });
+  });
+
   /*   describe('CircuitString8', async () => {
     test('cannot create more than 8 chars', () => {
       expect(() => {

diff --git a/src/mina b/src/mina
diff --git a/src/mina-signer/tests/client.test.ts b/src/mina-signer/tests/client.test.ts
@@ -1,4 +1,4 @@
-import Client from '../../../dist/node/mina-signer/mina-signer.js';
+import Client from '../dist/node/mina-signer/mina-signer.js';
 
 describe('Client Class Initialization', () => {
   let client;

diff --git a/src/mina-signer/tests/keypair.test.ts b/src/mina-signer/tests/keypair.test.ts
@@ -1,4 +1,4 @@
-import Client from '../../../dist/node/mina-signer/mina-signer.js';
+import Client from '../dist/node/mina-signer/mina-signer.js';
 
 describe('Keypair', () => {
   let client: Client;

diff --git a/src/mina-signer/tests/message.test.ts b/src/mina-signer/tests/message.test.ts
@@ -1,5 +1,5 @@
-import Client from '../../../dist/node/mina-signer/mina-signer.js';
-import type { PrivateKey } from '.../.././dist/node/mina-signer/src/types.js';
+import Client from '../dist/node/mina-signer/mina-signer.js';
+import type { PrivateKey } from '../dist/node/mina-signer/src/types.js';
 
 describe('Message', () => {
   describe('Mainnet network', () => {

diff --git a/src/mina-signer/tests/payment.test.ts b/src/mina-signer/tests/payment.test.ts
@@ -1,5 +1,5 @@
-import Client from '../../../dist/node/mina-signer/mina-signer.js';
-import type { Keypair } from '../../../dist/node/mina-signer/src/types.js';
+import Client from '../dist/node/mina-signer/mina-signer.js';
+import type { Keypair } from '../dist/node/mina-signer/src/types.js';
 
 describe('Payment', () => {
   describe('Mainnet network', () => {

diff --git a/src/mina-signer/tests/rosetta.test.ts b/src/mina-signer/tests/rosetta.test.ts
@@ -1,7 +1,7 @@
-import Client from '../../../dist/node/mina-signer/mina-signer.js';
-import { fieldFromHex, fieldToHex, signatureJsonToHex, signatureJsonFromHex, UnsignedTransaction, publicKeyToHex, signTransaction } from '../../../dist/node/mina-signer/src/rosetta.js';
-import { PublicKey } from '../../../dist/node/mina-signer/src/curve-bigint.js';
-import { Field } from '../../../dist/node/mina-signer/src/field-bigint.js';
+import Client from '../dist/node/mina-signer/mina-signer.js';
+import { fieldFromHex, fieldToHex, signatureJsonToHex, signatureJsonFromHex, UnsignedTransaction, publicKeyToHex, signTransaction } from '../dist/node/mina-signer/src/rosetta.js';
+import { PublicKey } from '../dist/node/mina-signer/src/curve-bigint.js';
+import { Field } from '../dist/node/mina-signer/src/field-bigint.js';
 
 describe('Rosetta', () => {
   let client: Client;

diff --git a/src/mina-signer/tests/stake-delegation.test.ts b/src/mina-signer/tests/stake-delegation.test.ts
@@ -1,5 +1,5 @@
-import Client from '../../../dist/node/mina-signer/mina-signer.js';
-import type { Keypair } from '../../../dist/node/mina-signer/src/types.js';
+import Client from '../dist/node/mina-signer/mina-signer.js';
+import type { Keypair } from '../dist/node/mina-signer/src/types.js';
 
 describe('Stake Delegation', () => {
   describe('Mainnet network', () => {