Merge pull request #478 from Zokrates/wasm-friendly

Wasm friendliness
Zokrates · Jan 30, 2020 · 7e55545 · 7e55545
2 parents 11dd790 + 14cd634
commit 7e55545
Show file tree

Hide file tree

Showing 59 changed files with 8,106 additions and 1,585 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -57,6 +57,26 @@ jobs:
       # - run:
       #     name: Generate code coverage report
       #     command: ./scripts/cov.sh
+  wasm_test:
+    docker:
+      - image: rustlang/rust:nightly-slim
+    steps:
+      - checkout
+      - run:
+          name: Version information
+          command: rustc --version; cargo --version; rustup --version
+      - run:
+          name: Calculate dependencies
+          command: cargo generate-lockfile
+      - restore_cache:
+          keys:
+            - v4-cargo-cache-{{ arch }}-{{ checksum "Cargo.lock" }}
+      - run:
+          name: Install wasm testing env
+          command: ./scripts/install_wasm_testing.sh
+      - run:
+          name: Test on firefox
+          command: ZOKRATES_HOME=$(pwd)/zokrates_stdlib/stdlib/ cd zokrates_core && wasm-pack test --firefox --headless -- --features wasm 
   integration_test:
     docker:
       - image: rustlang/rust:nightly-slim
@@ -84,22 +104,39 @@ jobs:
           command: ZOKRATES_HOME=$(pwd)/zokrates_stdlib/stdlib/ WITH_LIBSNARK=1 RUSTFLAGS="-D warnings" ./full_test.sh
   deploy:
     docker:
-      - image: circleci/python
+      - image: circleci/python:latest-node
     steps:
       - checkout
       - setup_remote_docker:
           docker_layer_caching: true
       - run:
           name: Release
           command: ./scripts/release.sh
-
+  zokrates_js_build:
+    docker:
+      - image: circleci/node
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run:
+          command: ./zokrates_js/build.sh
+  zokrates_js_test:
+    docker:
+      - image: circleci/node
+    steps:
+      - checkout
+      - run:
+          command: cd zokrates_js && npm run test
 workflows:
   version: 2
   build-test-and-deploy:
     jobs:
       - build
       - test
+      - wasm_test
       - integration_test
+      - zokrates_js_build
+      - zokrates_js_test
       - deploy:
           filters:
             branches:
@@ -108,6 +145,7 @@ workflows:
           requires:
             - build
             - test
+            - wasm_test
             - integration_test
-
-
+            - zokrates_js_build
+            - zokrates_js_test
diff --git a/.gitignore b/.gitignore
@@ -19,4 +19,5 @@ witness
 
 .DS_Store
 .idea
+.vscode
 *.iml