testing fixes

Makefile

@@ -170,6 +170,14 @@ loadtest: confirm_action
 integration-testkit: build-contracts
 	cargo run --bin testkit --release
 
+itest: # contracts simple integration tests
+	@bin/prepare-test-contracts.sh
+	@cd contracts && yarn itest
+
+utest: # contracts unit tests
+	@bin/prepare-test-contracts.sh
+	@cd contracts && yarn unit-test
+
 integration-simple:
 	@cd js/tests && yarn && yarn simple
 

contracts/.waffle.json

@@ -1,6 +1,5 @@
 {
     "sourcesPath": "./contracts",
     "targetPath": "./build",
-    "compiler": "dockerized-solc",
-    "docker-tag": "0.5.16"
+    "compiler": "native"
 }

contracts/package.json

@@ -29,7 +29,7 @@
   "scripts": {
     "build": "waffle .waffle.json && waffle .waffle.config_flat.json",
     "test": "waffle .waffle.json && mocha -r ts-node/register test/**/*.ts",
-    "itest": "waffle .waffle.json && mocha -r ts-node/register test/integration_ganache.ts",
+    "itest": "waffle .waffle.json && mocha -r ts-node/register test/unit_tests/**/*.js test/integration_ganache.ts",
     "unit-test": "waffle .waffle.json && mocha test/unit_tests/**/*.js",
     "deploy": "yarn build && ts-node scripts/testnet-deploy.ts --deploy --publish",
     "deploy-test-no-build": "ts-node scripts/testnet-deploy.ts --deploy --test",

contracts/test/helpers.ts

@@ -184,21 +184,18 @@ export async function postBlockCommit(
     );
     if (!revertCode) {
 
-        const beforeOnchainOps = await franklinDeployedContract.totalOnchainOps();
-
         const commitReceipt = await tx.wait();
         const commitEvents = commitReceipt.events;
 
         const commitedEvent1 = commitEvents[0].args;
 
         expect(commitedEvent1.blockNumber).equal(blockNumber);
 
-        const afterOnchainOps = await franklinDeployedContract.totalOnchainOps();
-        // FIXME: ganache? expect(afterOnchainOps - beforeOnchainOps).equal(onchainOperationsNumber);
-
         expect((await franklinDeployedContract.blocks(blockNumber)).onchainOperations).equal(onchainOperationsNumber);
         expect((await franklinDeployedContract.blocks(blockNumber)).priorityOperations).equal(priorityOperationsNumber);
-        //FIXME: expect((await franklinDeployedContract.blocks(blockNumber)).commitment).equal(commitment);
+
+        expect((await franklinDeployedContract.blocks(blockNumber)).commitment).equal(commitment);
+
         expect((await franklinDeployedContract.blocks(blockNumber)).stateRoot).equal("0x" + newRoot);
         expect((await franklinDeployedContract.blocks(blockNumber)).validator).equal(wallet.address);