Skip to content

Commit 1735760

Browse files
committed
Improve verify assertions in zkfunction examples
1 parent 345ac23 commit 1735760

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

src/examples/zkfunction/ecdsa.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Experimental, Crypto, createForeignCurve, Bytes, assert, createEcdsa } from 'o1js';
1+
import { Bytes, Crypto, Experimental, createEcdsa, createForeignCurve } from 'o1js';
22
const { ZkFunction } = Experimental;
33

4-
export { Secp256k1, Ecdsa, Bytes32, reserves };
4+
export { Bytes32, Ecdsa, Secp256k1, reserves };
55

66
class Secp256k1 extends createForeignCurve(Crypto.CurveParams.Secp256k1) {}
77
class Ecdsa extends createEcdsa(Secp256k1) {}
@@ -12,7 +12,7 @@ const reserves = ZkFunction({
1212
publicInputType: Bytes32,
1313
privateInputTypes: [Ecdsa, Secp256k1],
1414
main: (message: Bytes32, signature: Ecdsa, publicKey: Secp256k1) => {
15-
assert(signature.verify(message, publicKey));
15+
signature.verify(message, publicKey).assertTrue();
1616
},
1717
});
1818

@@ -31,5 +31,6 @@ console.timeEnd('prove');
3131

3232
console.time('verify');
3333
let isValid = await reserves.verify(proof, verificationKey);
34-
assert(isValid, 'verifies');
3534
console.timeEnd('verify');
35+
36+
if (!isValid) throw Error('verification failed!');

src/examples/zkfunction/preimage.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Poseidon, Field, Experimental } from 'o1js';
1+
import { Experimental, Field, Poseidon } from 'o1js';
22
const { ZkFunction } = Experimental;
33

44
/**
@@ -26,7 +26,7 @@ console.log('prove...');
2626
const pi = await main.prove(hash, preimage);
2727

2828
console.log('verify...');
29-
let ok = await main.verify(pi, verificationKey);
30-
console.log('ok?', ok);
29+
let isValid = await main.verify(pi, verificationKey);
30+
console.log('isValid?', isValid);
3131

32-
if (!ok) throw Error('verification failed');
32+
if (!isValid) throw Error('verification failed!');

src/examples/zkfunction/root.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Field, Experimental, Gadgets } from 'o1js';
1+
import { Experimental, Field, Gadgets } from 'o1js';
22
const { ZkFunction } = Experimental;
33

44
/**
@@ -29,7 +29,8 @@ const proof = await main.prove(x, y);
2929
console.timeEnd('prove...');
3030

3131
console.time('verify...');
32-
let ok = await main.verify(proof, verificationKey);
32+
let isValid = await main.verify(proof, verificationKey);
3333
console.timeEnd('verify...');
3434

35-
console.log('ok?', ok);
35+
console.log('isValid?', isValid);
36+
if (!isValid) throw Error('verification failed!');

0 commit comments

Comments
 (0)