Merge pull request #57 from barryWhiteHat/feat/circleci

CircleCI
privacy-scaling-explorations · Feb 7, 2020 · 00d4902 · 00d4902
2 parents 98d91cb + da28d0a
commit 00d4902
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 54 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,12 +1,7 @@
-# Javascript Node CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-javascript/ for more details
-#
 version: 2
 jobs:
   build:
     docker:
-      # specify the version you desire here
       - image: circleci/node:11.14.0
 
     working_directory: ~/maci/
@@ -21,18 +16,20 @@ jobs:
 
       - restore_cache:
           keys:
-            - v1.0-dependencies-{{ checksum "package-lock.json" }}
+            - v1.1-dependencies-{{ checksum "package-lock.json" }}
 
-      - run: npm install
+      - run: 
+          name: Install NPM dependencies
+          command: npm install
 
       - save_cache:
           paths:
             - node_modules
-          key: v1.0-dependencies-{{ checksum "package-lock.json" }}
+          key: v1.1-dependencies-{{ checksum "package-lock.json" }}
 
       - restore_cache:
           keys:
-            - v1.0-dependencies-{{ checksum "contracts/package-lock.json" }}-{{ checksum "circuits/package-lock.json" }}-{{ checksum "config/package-lock.json" }}-{{ checksum "domainobjs/package-lock.json" }}-{{ checksum "coordinator/package-lock.json" }}
+            - v1.1-dependencies-{{ checksum "contracts/package-lock.json" }}-{{ checksum "circuits/package-lock.json" }}-{{ checksum "config/package-lock.json" }}-{{ checksum "domainobjs/package-lock.json" }}-{{ checksum "coordinator/package-lock.json" }}
 
       - run: npm run bootstrap && npm run build
 
@@ -41,44 +38,45 @@ jobs:
             - contracts/node_modules
             - config/node_modules
             - circuits/node_modules
-          key: v1.0-dependencies-{{ checksum "contracts/package-lock.json" }}-{{ checksum "circuits/package-lock.json" }}-{{ checksum "config/package-lock.json" }}-{{ checksum "domainobjs/package-lock.json" }}-{{ checksum "coordinator/package-lock.json" }}
-
-      ## checksum the snarks definitions
-      #- run:
-          #name: Checksum snark files
-          #command: cd circuits/ && ./scripts/checksumSnarks.sh
-
-      #- restore_cache:
-          #name: restore-snark-cache
-          #keys:
-            #- v1.0-dependencies-{{ checksum "circuits/build/.snark_checksum" }}
-
-      ## build snarks
-      #- run:
-          #name: Build  the batch update state tree snark
-          #command: cd circuits && npm run buildBatchUpdateStateTreeSnark && npm run buildQuadVoteTallySnark
-          #no_output_timeout: 600m
-          #
-      #- run:
-          #name: Build  the quad vote tally snark
-          #command: cd circuits && npm run buildQuadVoteTallySnark
-          #no_output_timeout: 600m
-
-      ## cache generated snark circuit and keys
-      #- save_cache:
-          #key: v1.0-dependencies-{{ checksum "circuits/build/.snark_checksum" }}
-          #paths:
-            #- circuits/build/BatchUpdateStateTreeVerifier.sol
-            #- circuits/build/batchUstCircuit.json
-            #- circuits/build/batchUstPk.bin
-            #- circuits/build/batchUstVk.json
-            #- circuits/build/QuadVoteTallyVerifier.sol
-            #- circuits/build/qvtCircuit.json
-            #- circuits/build/qvtPk.bin
-            #- circuits/build/qvtVk.json
+            - domainobjs/node_modules
+          key: v1.1-dependencies-{{ checksum "contracts/package-lock.json" }}-{{ checksum "circuits/package-lock.json" }}-{{ checksum "config/package-lock.json" }}-{{ checksum "domainobjs/package-lock.json" }}-{{ checksum "coordinator/package-lock.json" }}
 
+      # checksum the snarks definitions
       - run:
-          name: compile-contracts
+          name: Checksum snark files
+          command: cd circuits/ && ./scripts/checksumSnarks.sh
+
+      - restore_cache:
+          name: restore-snark-cache
+          keys:
+            - v1.1-dependencies-{{ checksum "circuits/build/.snark_checksum" }}
+
+      # build snarks
+      - run:
+          name: Build the batch update state tree snark
+          command: cd circuits && npm run buildBatchUpdateStateTreeSnark
+          no_output_timeout: 600m
+
+      - run:
+          name: Build the quad vote tally snark
+          command: cd circuits && npm run buildQuadVoteTallySnark
+          no_output_timeout: 600m
+
+      # cache generated snark circuit and keys
+      - save_cache:
+          key: v1.1-dependencies-{{ checksum "circuits/build/.snark_checksum" }}
+          paths:
+            - circuits/build/BatchUpdateStateTreeVerifier.sol
+            - circuits/build/batchUstCircuit.json
+            - circuits/build/batchUstPk.bin
+            - circuits/build/batchUstVk.json
+            - circuits/build/QuadVoteTallyVerifier.sol
+            - circuits/build/qvtCircuit.json
+            - circuits/build/qvtPk.bin
+            - circuits/build/qvtVk.json
+
+      - run:
+          name: Compile contracts
           command: cd contracts && npm run compileSol
 
       - run:
@@ -89,13 +87,13 @@ jobs:
           name: Run domainobjs tests
           command: cd domainobjs && npm run test
 
-      #- run:
-          #name: Run circuit tests
-          #command: cd circuits && ./scripts/runTestsInCircleCi.sh
+      - run:
+          name: Run circuit tests
+          command: cd circuits && ./scripts/runTestsInCircleCi.sh
 
-      #- run:
-          #name: Run contract tests
-          #command: cd contracts && ./scripts/runTestsInCircleCi.sh
+      - run:
+          name: Run contract tests
+          command: cd contracts && ./scripts/runTestsInCircleCi.sh
 
-      #- store_artifacts:
-          #path: circuits/build
+      - store_artifacts:
+          path: circuits/build
diff --git a/circuits/package.json b/circuits/package.json
@@ -10,6 +10,8 @@
         "buildQuadVoteTallySnark": "./scripts/buildQuadVoteTallySnark.sh",
         "downloadAllSnarks": "./scripts/downloadAllSnarks.sh",
         "test": "jest",
+        "test-minor": "jest --force-exit Hasher.test.ts MerkleTree.test.ts VerifySignature.test.ts Ecdh.test.ts PublicKey.test.ts Decrypt.test.ts",
+        "test-major": "jest --force-exit QuadVoteTally.test.ts UpdateStateTree.test.ts",
         "test-hasher": "jest Hasher.test.ts",
         "test-hasher-debug": "node --inspect-brk ./node_modules/.bin/jest Hasher.test.ts",
         "test-mt": "jest MerkleTree.test.ts",

diff --git a/circuits/scripts/runTestsInCircleCi.sh b/circuits/scripts/runTestsInCircleCi.sh
@@ -3,4 +3,5 @@
 cd "$(dirname "$0")"
 cd ..
 
-npx jest --force-exit
+npm run test-minor
+npm run test-major