-
Notifications
You must be signed in to change notification settings - Fork 213
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into tf/noir-js-testing-ci
* master: fix: Conditionally run the "Create or Update PR" step in acir artifacts rebuild workflow (#2849) fix: lack of cjs package version (#2848)
- Loading branch information
Showing
7 changed files
with
168 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "extensions": ["cjs"], | ||
| "spec": [ | ||
| "test/node/**/*.test.cjs" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* eslint-disable no-undef */ | ||
| /* eslint-disable @typescript-eslint/no-var-requires */ | ||
| const chai = require('chai'); | ||
| const assert_lt_json = require('../noir_compiled_examples/assert_lt/target/assert_lt.json'); | ||
| const noirjs = require('@noir-lang/noir_js'); | ||
|
|
||
| it('generates witnesses successfully', async () => { | ||
| const inputs = { | ||
| x: '2', | ||
| y: '3', | ||
| }; | ||
| const _solvedWitness = await noirjs.generateWitness(assert_lt_json, inputs); | ||
| }); | ||
|
|
||
| it('string input and number input are the same', async () => { | ||
| const inputsString = { | ||
| x: '2', | ||
| y: '3', | ||
| }; | ||
| const inputsNumber = { | ||
| x: 2, | ||
| y: 3, | ||
| }; | ||
| const solvedWitnessString = await noirjs.generateWitness(assert_lt_json, inputsString); | ||
| const solvedWitnessNumber = await noirjs.generateWitness(assert_lt_json, inputsNumber); | ||
| chai.expect(solvedWitnessString).to.deep.equal(solvedWitnessNumber); | ||
| }); | ||
|
|
||
| it('string input and number input are the same', async () => { | ||
| const inputsString = { | ||
| x: '2', | ||
| y: '3', | ||
| }; | ||
| const inputsNumber = { | ||
| x: 2, | ||
| y: 3, | ||
| }; | ||
|
|
||
| const solvedWitnessString = await noirjs.generateWitness(assert_lt_json, inputsString); | ||
| const solvedWitnessNumber = await noirjs.generateWitness(assert_lt_json, inputsNumber); | ||
| chai.expect(solvedWitnessString).to.deep.equal(solvedWitnessNumber); | ||
| }); | ||
|
|
||
| it('0x prefixed string input for inputs will throw', async () => { | ||
| const inputsHexPrefix = { | ||
| x: '0x2', | ||
| y: '0x3', | ||
| }; | ||
|
|
||
| try { | ||
| await noirjs.generateWitness(assert_lt_json, inputsHexPrefix); | ||
| chai.expect.fail( | ||
| 'Expected generatedWitness to throw, due to inputs being prefixed with 0x. Currently not supported', | ||
| ); | ||
| } catch (error) { | ||
| // Successfully errored due to 0x not being supported. Update this test once/if we choose | ||
| // to support 0x prefixed inputs. | ||
| } | ||
| }); | ||
|
|
||
| describe('input validation', () => { | ||
| it('x should be a uint64 not a string', async () => { | ||
| const inputs = { | ||
| x: 'foo', | ||
| y: '3', | ||
| }; | ||
|
|
||
| try { | ||
| await noirjs.generateWitness(assert_lt_json, inputs); | ||
| chai.expect.fail('Expected generatedWitness to throw, due to x not being convertible to a uint64'); | ||
| } catch (error) { | ||
| const knownError = error; | ||
| chai.expect(knownError.message).to.equal('Input for x is the wrong type, expected uint64, got "foo"'); | ||
| } | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "targets": [ | ||
| { "extname": ".cjs", "module": "commonjs" }, | ||
| { "extname": ".mjs", "module": "esnext" } | ||
| ], | ||
| "projects": ["packages/*/tsconfig.json"] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters