Testing solidity-coverage hardhat plugin

.circleci/src/commands/fork_deploy.yml → .circleci/src/commands/cmd-fork-deploy.yml

@@ -3,7 +3,7 @@ parameters:
   network:
     type: string
 steps:
-  - fork_start:
+  - cmd-fork-start:
       network: << parameters.network >>
       reset: true
   - run: node publish deploy --use-fork --yes --network << parameters.network >>

.circleci/src/commands/fork_start.yml → .circleci/src/commands/cmd-fork-start.yml

@@ -9,4 +9,4 @@ steps:
   - run:
       command: node publish fork --network << parameters.network >> <<# parameters.reset >> --reset <</ parameters.reset >>
       background: true
-  - wait_for_rpc
+  - cmd-wait-for-rpc

.circleci/src/commands/fork_test_prod.yml → .circleci/src/commands/cmd-fork-test-prod.yml

@@ -3,7 +3,9 @@ parameters:
   network:
     type: string
 steps:
-  - fork_start:
+  - cmd-fork-start:
       network: << parameters.network >>
       reset: true
   - run: npm run test:prod:gas && npx codechecks codechecks.prod.yml
+  - store_artifacts:
+      path: test-gas-used-prod.log

.circleci/src/jobs/job-compile.yml

@@ -0,0 +1,9 @@
+working_directory: ~/repo
+docker:
+  - image: circleci/node:12.18
+steps:
+  - checkout
+  - attach_workspace:
+      at: .
+  - run: npx buidler compile --optimizer --fail-oversize
+  - run: npx buidler compile --use-ovm --optimizer --fail-oversize

.circleci/src/jobs/fork-test-prod.yml → .circleci/src/jobs/job-fork-deploy.yml

@@ -8,5 +8,5 @@ steps:
   - checkout
   - attach_workspace:
       at: .
-  - fork_test_prod:
+  - cmd-fork-deploy:
       network: << parameters.network >>

.circleci/src/jobs/fork-prepare-deploy.yml → .circleci/src/jobs/job-fork-prepare-deploy.yml

@@ -8,5 +8,5 @@ steps:
   - checkout
   - attach_workspace:
       at: .
-  - fork_prepare_deploy:
+  - cmd-fork-prepare-deploy:
       network: << parameters.network >>

.circleci/src/jobs/fork-deploy.yml → .circleci/src/jobs/job-fork-test-prod.yml

@@ -8,5 +8,5 @@ steps:
   - checkout
   - attach_workspace:
       at: .
-  - fork_deploy:
+  - cmd-fork-test-prod:
       network: << parameters.network >>

.circleci/src/jobs/gas-report.yml → .circleci/src/jobs/job-gas-report.yml

@@ -6,3 +6,5 @@ steps:
   - attach_workspace:
       at: .
   - run: npm run test:gas && npx codechecks codechecks.unit.yml
+  - store_artifacts:
+      path: test-gas-used.log

.circleci/src/jobs/prepare.yml → .circleci/src/jobs/job-prepare.yml

@@ -6,7 +6,7 @@ steps:
   - restore_cache:
       keys:
         - 'v2-dependencies-{{ checksum "package-lock.json" }}'
-  - run: npm ci
+  - run: yarn
   - save_cache:
       key: 'v2-dependencies-{{ checksum "package-lock.json" }}'
       paths:

.circleci/src/jobs/test-kovan.yml → .circleci/src/jobs/job-test-kovan.yml

@@ -5,7 +5,7 @@ steps:
   - checkout
   - attach_workspace:
       at: .
-  - testnet_pvt:
+  - cmd-testnet-pvt:
       network: kovan
-  - etherscan_check:
+  - cmd-etherscan-check:
       network: kovan

.circleci/src/jobs/test-mainnet.yml → .circleci/src/jobs/job-test-mainnet.yml

@@ -6,5 +6,5 @@ steps:
   - attach_workspace:
       at: .
   # - run: No PVT for mainnet just yet
-  - etherscan_check:
+  - cmd-etherscan-check:
       network: mainnet

.circleci/src/jobs/test-ovm.yml → .circleci/src/jobs/job-test-ovm.yml

@@ -6,6 +6,6 @@ steps:
   - attach_workspace:
       at: .
   - run:
-      name: Compile in OVM, enforcing size limit
+      name: Run unit tests on OVM compiled output (TODO enable tests)
       command: |
-        npx buidler compile --ovm --optimizer
+        npx buidler compile --use-ovm --optimizer

.circleci/src/jobs/test-rinkeby.yml → .circleci/src/jobs/job-test-rinkeby.yml

@@ -5,7 +5,7 @@ steps:
   - checkout
   - attach_workspace:
       at: .
-  - testnet_pvt:
+  - cmd-testnet-pvt:
       network: rinkeby
-  - etherscan_check:
+  - cmd-etherscan-check:
       network: rinkeby

.circleci/src/workflows/workflow-dev.yml

@@ -0,0 +1,8 @@
+jobs:
+  - job-prepare
+  - job-test-ovm:
+      requires:
+        - job-prepare
+  - job-coverage-report:
+      requires:
+        - job-prepare

.circleci/src/workflows/forkprod-tests.yml → .circleci/src/workflows/workflow-prod.yml

@@ -1,71 +1,71 @@
 jobs:
-  - prepare:
+  - job-prepare:
       filters:
         branches:
           only: develop
   # ~~~~~~~~~~~~~~~ MAINNET ~~~~~~~~~~~~~~~ #
-  - fork-prepare-deploy:
-      name: fork-prepare-deploy-mainnet
+  - job-fork-prepare-deploy:
+      name: job-fork-prepare-deploy-mainnet
       network: mainnet
       requires:
-        - prepare
-  - fork-deploy:
-      name: fork-deploy-mainnet
+        - job-prepare
+  - job-fork-deploy:
+      name: job-fork-deploy-mainnet
       network: mainnet
       requires:
-        - fork-prepare-deploy-mainnet
-  - fork-test-prod:
-      name: fork-test-prod-mainnet
+        - job-fork-prepare-deploy-mainnet
+  - job-fork-test-prod:
+      name: job-fork-test-prod-mainnet
       network: mainnet
       requires:
-        - fork-deploy-mainnet
+        - job-fork-deploy-mainnet
   # ~~~~~~~~~~~~~~~ RINKEBY ~~~~~~~~~~~~~~~ #
-  - fork-prepare-deploy:
-      name: fork-prepare-deploy-rinkeby
+  - job-fork-prepare-deploy:
+      name: job-fork-prepare-deploy-rinkeby
       network: rinkeby
       requires:
-        - prepare
+        - job-prepare
       filters:
         branches:
           only: develop
-  - fork-deploy:
-      name: fork-deploy-rinkeby
+  - job-fork-deploy:
+      name: job-fork-deploy-rinkeby
       network: rinkeby
       requires:
-        - fork-prepare-deploy-rinkeby
+        - job-fork-prepare-deploy-rinkeby
       filters:
         branches:
           only: develop
-  - fork-test-prod:
-      name: fork-test-prod-rinkeby
+  - job-fork-test-prod:
+      name: job-fork-test-prod-rinkeby
       network: rinkeby
       requires:
-        - fork-deploy-rinkeby
+        - job-fork-deploy-rinkeby
       filters:
         branches:
           only: develop
   # ~~~~~~~~~~~~~~~ KOVAN ~~~~~~~~~~~~~~~ #
-  - fork-prepare-deploy:
-      name: fork-prepare-deploy-kovan
+  - job-fork-prepare-deploy:
+      name: job-fork-prepare-deploy-kovan
       network: rinkeby
       requires:
-        - prepare
+        - job-prepare
       filters:
         branches:
           only: develop
-  - fork-deploy:
-      name: fork-deploy-kovan
+  - job-fork-deploy:
+      name: job-fork-deploy-kovan
       network: rinkeby
       requires:
-        - fork-prepare-deploy-kovan
+        - job-fork-prepare-deploy-kovan
       filters:
         branches:
           only: develop
-  - fork-test-prod:
-      name: fork-test-prod-kovan
+  - job-fork-test-prod:
+      name: job-fork-test-prod-kovan
       network: rinkeby
       requires:
-        - fork-deploy-kovan
+        - job-fork-deploy-kovan
       filters:
         branches:
           only: develop

.solcover.js

@@ -1,19 +1,8 @@
-const {
-	constants: { inflationStartTimestampInSecs },
-} = require('.');
-
 module.exports = {
-	port: 8545,
 	skipFiles: [
 		'test-helpers',
 		'EscrowChecker.sol',
 	],
-	providerOptions: {
-		default_balance_ether: 10000000000000, // extra zero just in case (coverage consumes more gas)
-		time: new Date(inflationStartTimestampInSecs * 1000),
-		network_id: 55,
-		gasLimit: 0x1fffffffffffff,
-	},
 	mocha: {
 		grep: '@cov-skip', // Find everything with this tag
 		invert: true, // Run the grep's inverse set.
@@ -22,5 +11,4 @@ module.exports = {
 	// passed to compiler causes it to crash (See discussion PR #732)
 	// Line and branch coverage will still be reported.
 	measureStatementCoverage: false,
-	measureFunctionCoverage: true,
 };

hardhat.config.js

@@ -11,7 +11,7 @@ const { TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD } = require('hardhat/builtin-tasks/
 // require('@eth-optimism/ovm-toolchain/build/src/buidler-plugins/buidler-ovm-compiler'); // enable custom solc compiler
 // require('@eth-optimism/ovm-toolchain/build/src/buidler-plugins/buidler-ovm-node'); // add ability to start an OVM node
 
-// usePlugin('solidity-coverage');
+require('solidity-coverage');
 // usePlugin('buidler-ast-doc'); // compile ASTs for use with synthetix-docs
 // usePlugin('buidler-gas-reporter');
 
@@ -305,6 +305,7 @@ const localNetwork = Object.assign(
 	baseNetworkConfig
 );
 
+
 module.exports = {
 	GAS_PRICE,
 	solidity: {
@@ -330,7 +331,6 @@ module.exports = {
 	},
 	networks: {
 		hardhat: baseNetworkConfig,
-		coverage: localNetwork,
 		localhost: localNetwork,
 	},
 	gasReporter: {