From 5d54fe98d1c83ac42856f2723e7996821b0fc2a0 Mon Sep 17 00:00:00 2001 From: Daniel Tehrani Date: Tue, 31 Jan 2023 13:54:36 +0900 Subject: [PATCH] Output the built wasm under spartan_wasm Simpler to have the build files under its own source dir --- packages/lib/copy_artifacts.sh | 4 +--- packages/lib/load_wasm.ts | 2 +- scripts/build_wasm.sh | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/lib/copy_artifacts.sh b/packages/lib/copy_artifacts.sh index 40e1424..c434422 100644 --- a/packages/lib/copy_artifacts.sh +++ b/packages/lib/copy_artifacts.sh @@ -1,7 +1,5 @@ # Copy circuit artifacts into the lib build dir mkdir -p ./build/circuits/ && -cp ./src/circuits/* ./build/circuits/ && +cp ./src/circuits/* ./build/circuits/ -# Copy wasm into the lib build dir -cp ./src/wasm/build/*.wasm ./build/wasm/build/ diff --git a/packages/lib/load_wasm.ts b/packages/lib/load_wasm.ts index a30763e..e200f61 100644 --- a/packages/lib/load_wasm.ts +++ b/packages/lib/load_wasm.ts @@ -4,7 +4,7 @@ import * as fs from "fs"; * Load the wasm file and output a typescript file with the wasm bytes embedded */ const loadWasm = async () => { - let wasm = fs.readFileSync("src/wasm/build/spartan_wasm_bg.wasm"); + let wasm = fs.readFileSync("../spartan_wasm/build/spartan_wasm_bg.wasm"); let bytes = new Uint8Array(wasm.buffer); diff --git a/scripts/build_wasm.sh b/scripts/build_wasm.sh index e7dbbfe..1338a5d 100644 --- a/scripts/build_wasm.sh +++ b/scripts/build_wasm.sh @@ -1,3 +1,3 @@ -rm -rf ./packages/lib/src/wasm/build && +rm -rf ./packages/spartan_wasm/build && cd ./packages/spartan_wasm && -wasm-pack build --target web --out-dir ../lib/src/wasm/build +wasm-pack build --target web --out-dir ../spartan_wasm/build