added contract tests to integration_test circleci job

.circleci/config.yml

@@ -90,15 +90,15 @@ jobs:
           name: Install git
           command: apt-get update && apt-get upgrade -y && apt-get install -y git
       - 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: 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 libsnark prerequisites
           command: ./scripts/install_libsnark_prerequisites.sh

full_test.sh

@@ -3,10 +3,10 @@
 # Exit if any subcommand fails
 set -e
 
-# cargo test --release -- --ignored
+cargo test --release -- --ignored
 
-# if [ -n "$WITH_LIBSNARK" ]; then
-	# cargo -Z package-features test --release --package zokrates_cli --features="libsnark" -- --ignored
+if [ -n "$WITH_LIBSNARK" ]; then
+	cargo -Z package-features test --release --package zokrates_cli --features="libsnark" -- --ignored
 	ls
 	cd target/debug/
 
@@ -57,4 +57,4 @@ set -e
 	node zokrates_core/tests/integration/test.js pghr13 v2
 	node zokrates_core/tests/integration/test.js gm17 v1
 	node zokrates_core/tests/integration/test.js gm17 v2
-# fi
+fi

zokrates_core/tests/integration/test.js

@@ -1,13 +1,10 @@
 var fs = require("fs");
 let Web3 = require('web3');
 const solc = require('solc');
-console.log(process.argv)
 const format = process.argv[2]
 const abiVersion = process.argv[3];
 const CONTRACT_NAME = format + "-" + abiVersion + "-verifier.sol";
 const web3 = new Web3(new Web3.providers.HttpProvider('http://localhost:8545'));
-console.log(__dirname);
-console.log(fs.existsSync("target/"));
 console.log(CONTRACT_NAME)
 
 // -----Compile contract-----