Merge pull request #88 from near/zkevm_submodule

Add zkevm-proverjs as a submodule

.github/workflows/main.yml

@@ -42,10 +42,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - uses: actions/setup-node@v3
       with:
         node-version: '20.8.0'
-    - run: ./ci/test-zkasm.sh --install-zkwasm --all
+    - run: ./ci/test-zkasm.sh --all
 
   rustfmt:
     name: Rustfmt

.gitmodules

@@ -17,3 +17,7 @@
 	path = tests/wasi_testsuite/wasi-common
 	url = https://github.com/WebAssembly/wasi-testsuite.git
 	branch = prod/testsuite-base
+[submodule "deps/zkevm-proverjs"]
+	path = deps/zkevm-proverjs
+	url = https://github.com/0xPolygonHermez/zkevm-proverjs/
+	branch = feature/64bits

ci/test-zkasm.sh

@@ -9,19 +9,16 @@ set -o pipefail
 set -eux
 
 # Flags and default modes
-PREINSTALLED=true
 ALL_FILES=false
 
 # Parse flags
 while [[ "$#" -gt 0 ]]; do
     case $1 in
         --all) ALL_FILES=true; shift ;;
-        --install-zkwasm) PREINSTALLED=false; shift ;;
         --help)
             echo "Usage: $0 [OPTIONS] [filename.zkasm]"
             echo "Options:"
             echo "  --all                           Test all zkasm files"
-            echo "  --install-zkwasm                Temporarily install and use zkevm-rom"
             echo "  --help                          Show this message"
             exit 0
             ;;
@@ -34,19 +31,9 @@ if [ "$ALL_FILES" = false ] && [ -z "$1" ]; then
     exit 1
 fi
 
-BASE_DIR="../wasmtime"
-
-if [ "$PREINSTALLED" = false ]; then
-    echo "Cloning zkevm-proverjs into /tmp directory..."
-    git clone https://github.com/0xPolygonHermez/zkevm-proverjs/ ./tmp/zkevm-proverjs > /dev/null 2>&1
-    cd ./tmp/zkevm-proverjs
-    npm install
-    BASE_DIR="../.."
-else
-    cd ../zkevm-proverjs
-fi
-
-git checkout feature/64bits
+BASE_DIR="./../../"
+cd deps/zkevm-proverjs
+npm i
 
 NODE_CMD="node test/zkasmtest.js --rows 2**18"