Skip to content

Commit

Permalink
Merge branch 'master' into abi-wasm
Browse files Browse the repository at this point in the history
* master:
  chore: Make `wasm` tests pull from `result` directory (#2319)
  chore: Fix typo (#2315)
  • Loading branch information
TomAFrench committed Aug 15, 2023
2 parents 05195fb + 74ca305 commit 3d84a9b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ jobs:
uses: actions/download-artifact@v3
with:
name: noir_wasm
path: ./crates/wasm/dist
path: ./crates/wasm/result

- name: Download nargo binary
uses: actions/download-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion crates/wasm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This JavaScript package enables users to compile a Noir program, i.e. generating its artifacts.

The package also handles dependency management like how Nargo (Noir's CLI tool) opreates, but the package is used just for compilation, not proving, verifying and simulating functions.
The package also handles dependency management like how Nargo (Noir's CLI tool) operates, but the package is used just for compilation, not proving, verifying and simulating functions.

## Building from source

Expand Down
2 changes: 1 addition & 1 deletion crates/wasm/test/browser/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from "@esm-bundle/chai";
import initNoirWasm from "../../dist";
import initNoirWasm from "../../result";
import { compileNoirSource, nargoArtifactPath, noirSourcePath } from "../shared";

beforeEach(async () => {
Expand Down
2 changes: 1 addition & 1 deletion crates/wasm/test/shared.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { initialiseResolver } from "@noir-lang/noir-source-resolver";
import { compile } from "../dist/";
import { compile } from "../result/";

export const noirSourcePath = "../../noir-script/src/main.nr";
export const nargoArtifactPath = "../../noir-script/target/noir_wasm_testing.json";
Expand Down

0 comments on commit 3d84a9b

Please sign in to comment.