Skip to content

Commit 90de4c1

Browse files
authored
Merge pull request #1967 from o1-labs/fix/compatibility
Bring mina/compatible up to date
2 parents 8ef36d1 + 3cccc4a commit 90de4c1

File tree

5 files changed

+29
-3
lines changed

5 files changed

+29
-3
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
"test:integration": "./run-integration-tests.sh",
6565
"test:unit": "./run-unit-tests.sh",
6666
"test:e2e": "rimraf ./tests/report && rimraf ./tests/test-artifacts && npx playwright test",
67+
"test:all": "./run-all-local-tests.sh",
6768
"e2e:prepare-server": "npm run build:examples && (cp -rf dist/examples dist/web || :) && node src/build/e2e-tests-build-helper.js && cp -rf src/examples/plain-html/index.html src/examples/plain-html/server.js tests/artifacts/html/*.html tests/artifacts/javascript/*.js dist/web",
6869
"e2e:run-server": "node dist/web/server.js",
6970
"e2e:install": "npx playwright install --with-deps",

run-all-local-tests.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
echo "Running all local tests"
5+
6+
echo "Running jest tests"
7+
./run-jest-tests.sh
8+
9+
echo "Running integration tests"
10+
./run-integration-tests.sh
11+
12+
echo "Running unit tests"
13+
./run-unit-tests.sh
14+
15+
echo "Running e2e tests"
16+
rimraf ./tests/report && rimraf ./tests/test-artifacts && npx playwright test"

src/examples/zkprogram/program.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
JsonProof,
88
Provable,
99
Empty,
10+
Cache,
1011
} from 'o1js';
1112

1213
let MyProgram = ZkProgram({
@@ -24,6 +25,14 @@ let MyProgram = ZkProgram({
2425
},
2526
});
2627

27-
await MyProgram.compile();
28+
console.time('compile (with cache)');
29+
let { verificationKey } = await MyProgram.compile();
30+
console.timeEnd('compile (with cache)');
2831

32+
console.time('proving');
2933
let result = await MyProgram.baseCase();
34+
console.timeEnd('proving');
35+
36+
console.log('verifying');
37+
let ok = await verify(result.proof, verificationKey);
38+
console.log('ok', ok);

src/mina

Submodule mina updated 789 files

0 commit comments

Comments
 (0)