Remove optimistic unit tests (Synthetixio#1160)

* Remove useOvm from test task

* Remove useOvm from test task

* Remove @ovm-skip marker

* Removed ovm unit tests from CI

* Remove npm test:ovm task

Author: eternauta1337

.circleci/config.yml

@@ -260,27 +260,6 @@ jobs:
       - run: npm run test:gas
       - store_artifacts:
           path: test-gas-used.log
-  job-unit-tests-ovm:
-    working_directory: ~/repo
-    docker:
-      - image: synthetixio/docker-node:14.16-focal
-        auth:
-          username: $DOCKERHUB_USERNAME
-          password: $DOCKERHUB_TOKEN
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run: npx hardhat compile --showsize --optimizer --force --use-ovm
-      - run:
-          name: Test and output gas used
-          command: |
-            set +e
-            npm run test:ovm -- --no-compile
-            EXIT_CODE=$?
-            cat test-gas-used.log
-            printf "\\n"
-            exit $EXIT_CODE
   job-unit-tests:
     working_directory: ~/repo
     docker:
@@ -346,9 +325,6 @@ workflows:
       - job-unit-tests:
           requires:
             - job-prepare
-      - job-unit-tests-ovm:
-          requires:
-            - job-prepare
       - job-unit-tests-coverage:
           requires:
             - job-prepare

.circleci/src/jobs/job-unit-tests-ovm.yml

@@ -15,8 +15,6 @@ jobs:
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   - job-unit-tests:
       {{> require-prepare.yml}}
-  - job-unit-tests-ovm:
-      {{> require-prepare.yml}}
   - job-unit-tests-coverage:
       {{> require-prepare.yml}}
   - job-unit-tests-gas-report:

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

@@ -5,36 +5,14 @@ const optimizeIfRequired = require('../util/optimizeIfRequired');
 task('test')
 	.addFlag('optimizer', 'Compile with the optimizer')
 	.addFlag('gas', 'Compile gas usage')
-	.addFlag('useOvm', 'Run tests on the OVM using a custom OVM provider')
 	.addFlag('native', 'Compile with the native solc compiler')
 	.addOptionalParam('gasOutputFile', 'Gas reporter output file')
 	.addOptionalParam('grep', 'Filter tests to only those with given logic')
 	.setAction(async (taskArguments, hre, runSuper) => {
-		const { gas, grep, useOvm, native, gasOutputFile, noCompile } = taskArguments;
+		const { gas, grep, native, gasOutputFile } = taskArguments;
 
-		if (useOvm) {
-			if (!noCompile) {
-				await hre.run('compile', { useOvm });
-			}
-
-			if (!hre.config.prod) {
-				hre.ovm = true;
-			}
-
-			console.log(gray('Running tests in the OVM...'));
-			require('@eth-optimism/plugins/hardhat/compiler');
-			require('@eth-optimism/plugins/hardhat/web3');
-
-			if (!grep) {
-				console.log(gray(`Ignoring test specs containing`, yellow('@ovm-skip')));
-				hre.config.mocha.grep = '@ovm-skip';
-				hre.config.mocha.invert = true;
-			}
-			hre.config.mocha.timeout = 3600e3; // 1hr timeout for ovm
-		} else {
-			// apply a 90s timeout unless already set (for coverage say)
-			hre.config.mocha.timeout = hre.config.mocha.timeout || 90e3;
-		}
+		// apply a 90s timeout unless already set (for coverage say)
+		hre.config.mocha.timeout = hre.config.mocha.timeout || 90e3;
 
 		if (native) {
 			hre.config.solc.native = true;

hardhat/tasks/task-test.js

@@ -19,7 +19,6 @@
 		"test": "hardhat test",
 		"describe": "hardhat describe",
 		"test:gas": "hardhat test --gas --optimizer || cat test-gas-used.log",
-		"test:ovm": "hardhat test --use-ovm --optimizer",
 		"test:prod": "hardhat test:prod --network localhost --optimizer",
 		"test:prod:gas": "hardhat test:prod --gas --network localhost --optimizer --gas-output-file test-gas-used-prod.log",
 		"test:prod:ovm": "concurrently --kill-others --success first \"wait-port 8545 && wait-port 9545 && mocha test/optimism --timeout 900000\"",

package.json

@@ -13,7 +13,7 @@ const { mockGenericContractFnc, setupAllContracts } = require('./setup');
 
 const AddressResolver = artifacts.require('AddressResolver');
 
-contract('AddressResolver @ovm-skip', accounts => {
+contract('AddressResolver', accounts => {
 	const [deployerAccount, owner, account1, account2, account3, account4] = accounts;
 
 	let resolver;

test/contracts/AddressResolver.js

@@ -2,7 +2,7 @@ const { contract, artifacts } = require('hardhat');
 const { assert, addSnapshotBeforeRestoreAfterEach } = require('./common');
 const TestableAddressSet = artifacts.require('TestableAddressSet');
 
-contract('AddressSetLib @ovm-skip', accounts => {
+contract('AddressSetLib', accounts => {
 	let set;
 
 	const [a, b, c, d, e] = accounts;

test/contracts/AddressSetLib.js

@@ -19,7 +19,7 @@ const BN = require('bn.js');
 const ethers = require('ethers');
 const { parseEther } = ethers.utils;
 
-contract('BaseRewardEscrowV2 @ovm-skip', async accounts => {
+contract('BaseRewardEscrowV2', async accounts => {
 	const WEEK = 604800;
 	const YEAR = 31556926;
 

test/contracts/BaseRewardEscrowV2.js

@@ -21,7 +21,7 @@ const {
 
 const { toBytes32 } = require('../..');
 
-contract('BaseSynthetix @ovm-skip', async accounts => {
+contract('BaseSynthetix', async accounts => {
 	const [sUSD, sAUD, sEUR, SNX, sETH] = ['sUSD', 'sAUD', 'sEUR', 'SNX', 'sETH'].map(toBytes32);
 
 	const [, owner, account1, account2, account3] = accounts;

test/contracts/BaseSynthetix.js

@@ -13,7 +13,7 @@ let BinaryOption;
 
 const ZERO_ADDRESS = '0x' + '0'.repeat(40);
 
-contract('BinaryOption @gas-skip @ovm-skip', accounts => {
+contract('BinaryOption @gas-skip', accounts => {
 	const [account, bidder, recipient] = accounts;
 
 	const biddingTime = 100;

test/contracts/BinaryOption.js

@@ -38,7 +38,7 @@ const computePrices = (longs, shorts, debt, fee) => {
 	};
 };
 
-contract('BinaryOptionMarket @gas-skip @ovm-skip', accounts => {
+contract('BinaryOptionMarket @gas-skip', accounts => {
 	const [initialBidder, newBidder, pauper] = accounts;
 
 	const ZERO_ADDRESS = '0x' + '0'.repeat(40);

test/contracts/BinaryOptionMarket.js

@@ -6,7 +6,7 @@ const { setupContract, setupAllContracts } = require('./setup');
 const { currentTime, toUnit } = require('../utils')();
 const { toBytes32 } = require('../..');
 
-contract('BinaryOptionMarketData @gas-skip @ovm-skip', accounts => {
+contract('BinaryOptionMarketData @gas-skip', accounts => {
 	let market, setupTime, dataContract;
 
 	before(async () => {

test/contracts/BinaryOptionMarketData.js

@@ -30,7 +30,7 @@ const computePrices = (longs, shorts, debt, fee) => {
 	};
 };
 
-contract('BinaryOptionMarketManager @gas-skip @ovm-skip', accounts => {
+contract('BinaryOptionMarketManager @gas-skip', accounts => {
 	const [initialCreator, managerOwner, bidder, dummy] = accounts;
 
 	const sUSDQty = toUnit(10000);

test/contracts/BinaryOptionMarketManager.js

@@ -4,7 +4,7 @@ const TestableBytes32Set = artifacts.require('TestableBytes32Set');
 
 const { toBytes32 } = require('../..');
 
-contract('Bytes32SetLib @ovm-skip', accounts => {
+contract('Bytes32SetLib', accounts => {
 	let set;
 
 	const testBytes32 = ['a', 'b', 'c', 'd', 'e'].map(toBytes32);

test/contracts/Bytes32SetLib.js

@@ -6,7 +6,7 @@ const { ensureOnlyExpectedMutativeFunctions } = require('./helpers');
 
 let Collateral;
 
-contract('Collateral @ovm-skip', async accounts => {
+contract('Collateral', async accounts => {
 	before(async () => {
 		Collateral = artifacts.require(`Collateral`);
 	});

test/contracts/Collateral.js

@@ -25,7 +25,7 @@ let CollateralState;
 let ProxyERC20;
 let TokenState;
 
-contract('CollateralErc20 @ovm-skip', async accounts => {
+contract('CollateralErc20', async accounts => {
 	const YEAR = 31536000;
 	const INTERACTION_DELAY = 300;
 

test/contracts/CollateralErc20.js

@@ -21,7 +21,7 @@ let CollateralManager;
 let CollateralState;
 let CollateralManagerState;
 
-contract('CollateralEth @ovm-skip', async accounts => {
+contract('CollateralEth', async accounts => {
 	const YEAR = 31556926;
 	const INTERACTION_DELAY = 300;
 

test/contracts/CollateralEth.js

@@ -19,7 +19,7 @@ let CollateralManager;
 let CollateralState;
 let CollateralManagerState;
 
-contract('CollateralManager @ovm-skip', async accounts => {
+contract('CollateralManager', async accounts => {
 	const [deployerAccount, owner, oracle, , account1] = accounts;
 
 	const sETH = toBytes32('sETH');

test/contracts/CollateralManager.js

@@ -19,7 +19,7 @@ let CollateralManager;
 let CollateralState;
 let CollateralManagerState;
 
-contract('CollateralShort @ovm-skip', async accounts => {
+contract('CollateralShort', async accounts => {
 	const YEAR = 31556926;
 
 	const sUSD = toBytes32('sUSD');

test/contracts/CollateralShort.js

@@ -10,7 +10,7 @@ const { ensureOnlyExpectedMutativeFunctions, onlyGivenAddressCanInvoke } = requi
 const ContractStorage = artifacts.require('MockContractStorage');
 const AddressResolver = artifacts.require('AddressResolver');
 
-contract('ContractStorage @ovm-skip', accounts => {
+contract('ContractStorage', accounts => {
 	const [deployerAccount, owner, account1, account2] = accounts;
 
 	let storage;

test/contracts/ContractStorage.js

@@ -5,7 +5,7 @@ const { assert, addSnapshotBeforeRestoreAfterEach } = require('./common');
 
 const { setupAllContracts } = require('./setup');
 
-contract('DappMaintenance @ovm-skip', accounts => {
+contract('DappMaintenance', accounts => {
 	const [, ownerAccount, account1] = accounts;
 	let dappMaintenance;
 

test/contracts/DappMaintenance.js

@@ -22,7 +22,7 @@ const {
 	defaults: { DEBT_SNAPSHOT_STALE_TIME },
 } = require('../..');
 
-contract('DebtCache @ovm-skip', async accounts => {
+contract('DebtCache', async accounts => {
 	const [sUSD, sAUD, sEUR, SNX, sETH] = ['sUSD', 'sAUD', 'sEUR', 'SNX', 'sETH'].map(toBytes32);
 	const synthKeys = [sUSD, sAUD, sEUR, sETH, SNX];
 

test/contracts/DebtCache.js

@@ -12,7 +12,7 @@ const {
 	constants: { ZERO_ADDRESS },
 } = require('../..');
 
-contract('DelegateApprovals @ovm-skip', async accounts => {
+contract('DelegateApprovals', async accounts => {
 	const [deployerAccount, owner, account1, account2, account3] = accounts;
 
 	let delegateApprovals;

test/contracts/DelegateApprovals.js

@@ -25,7 +25,7 @@ const { GAS_PRICE } = require('../../hardhat.config');
 
 const { toBytes32 } = require('../..');
 
-contract('Depot @ovm-skip', async accounts => {
+contract('Depot', async accounts => {
 	let synthetix, synth, depot, addressResolver, systemStatus, exchangeRates, ethRate, snxRate;
 
 	const [, owner, oracle, fundsWallet, address1, address2, address3] = accounts;

test/contracts/Depot.js

@@ -10,7 +10,7 @@ const {
 	constants: { ZERO_ADDRESS },
 } = require('../..');
 
-contract('EternalStorage @ovm-skip', accounts => {
+contract('EternalStorage', accounts => {
 	const EternalStorage = artifacts.require('EternalStorage');
 	const [deployerAccount, owner, associatedContract, account1] = accounts;
 	let eternalStorage;

test/contracts/EternalStorage.js

@@ -20,7 +20,7 @@ const {
 
 const { toBytes32 } = require('../..');
 
-contract('EtherCollateral @ovm-skip', async accounts => {
+contract('EtherCollateral', async accounts => {
 	const MINUTE = 60;
 	const DAY = 86400;
 	const WEEK = 604800;

test/contracts/EtherCollateral.js

@@ -23,7 +23,7 @@ const {
 	constants: { ZERO_ADDRESS },
 } = require('../..');
 
-contract('EtherCollateralsUSD @ovm-skip', async accounts => {
+contract('EtherCollateralsUSD', async accounts => {
 	const MINUTE = 60;
 	const DAY = 86400;
 	const WEEK = 604800;

test/contracts/EtherCollateralsUSD.js

@@ -48,7 +48,7 @@ const createRandomKeysAndRates = quantity => {
 	return { currencyKeys, rates };
 };
 
-contract('Exchange Rates @ovm-skip', async accounts => {
+contract('Exchange Rates', async accounts => {
 	const [deployerAccount, owner, oracle, accountOne, accountTwo] = accounts;
 	const [SNX, sJPY, sXTZ, sBNB, sUSD, sEUR, sAUD, fastGasPrice] = [
 		'SNX',

test/contracts/ExchangeRates.js

@@ -12,7 +12,7 @@ const { isBN } = require('web3-utils');
 
 const ExchangeState = artifacts.require('ExchangeState');
 
-contract('ExchangeState @ovm-skip', accounts => {
+contract('ExchangeState', accounts => {
 	const [
 		deployerAccount,
 		owner, // Oracle next, is not needed

test/contracts/ExchangeState.js

@@ -30,7 +30,7 @@ const bnCloseVariance = '30';
 
 const MockAggregator = artifacts.require('MockAggregatorV2V3');
 
-contract('Exchanger (spec tests) @ovm-skip', async accounts => {
+contract('Exchanger (spec tests)', async accounts => {
 	const [sUSD, sAUD, sEUR, SNX, sBTC, iBTC, sETH, iETH] = [
 		'sUSD',
 		'sAUD',

test/contracts/Exchanger.spec.js

@@ -10,7 +10,7 @@ const { toBytes32 } = require('../..');
 
 let ExchangerWithVirtualSynth;
 
-contract('ExchangerWithVirtualSynth (unit tests) @ovm-skip', async accounts => {
+contract('ExchangerWithVirtualSynth (unit tests)', async accounts => {
 	const [, owner] = accounts;
 
 	before(async () => {

test/contracts/ExchangerWithVirtualSynth.unit.js

@@ -13,7 +13,7 @@ const {
 
 const { onlyGivenAddressCanInvoke, ensureOnlyExpectedMutativeFunctions } = require('./helpers');
 
-contract('ExternStateToken @ovm-skip', async accounts => {
+contract('ExternStateToken', async accounts => {
 	const [deployerAccount, owner, account1, account2, account3] = accounts;
 
 	let proxy;

test/contracts/ExternStateToken.js

@@ -33,7 +33,7 @@ const {
 	defaults: { ISSUANCE_RATIO, FEE_PERIOD_DURATION, TARGET_THRESHOLD },
 } = require('../..');
 
-contract('FeePool @ovm-skip', async accounts => {
+contract('FeePool', async accounts => {
 	const [deployerAccount, owner, oracle, account1, account2] = accounts;
 
 	// Updates rates with defaults so they're not stale.

test/contracts/FeePool.js

@@ -10,7 +10,7 @@ const {
 	constants: { ZERO_ADDRESS },
 } = require('../..');
 
-contract('FeePoolEternalStorage @ovm-skip', accounts => {
+contract('FeePoolEternalStorage', accounts => {
 	const FeePoolEternalStorage = artifacts.require('FeePoolEternalStorage');
 	const [deployerAccount, ownerAccount, feePoolAddress, account1, account2, account3] = accounts;
 	let feePool, feePoolEternalStorage;

test/contracts/FeePoolEternalStorage.js

@@ -9,7 +9,7 @@ const { onlyGivenAddressCanInvoke, ensureOnlyExpectedMutativeFunctions } = requi
 
 const FeePoolState = artifacts.require('FeePoolState');
 
-contract('FeePoolState @ovm-skip', async accounts => {
+contract('FeePoolState', async accounts => {
 	const [
 		deployerAccount,
 		owner,

test/contracts/FeePoolState.js

@@ -13,7 +13,7 @@ const { ensureOnlyExpectedMutativeFunctions, onlyGivenAddressCanInvoke } = requi
 const AddressResolver = artifacts.require('AddressResolver');
 const FlexibleStorage = artifacts.require('FlexibleStorage');
 
-contract('FlexibleStorage @ovm-skip', accounts => {
+contract('FlexibleStorage', accounts => {
 	const [deployerAccount, owner, account1, account2, account3] = accounts;
 
 	let storage;

test/contracts/FlexibleStorage.js

@@ -14,7 +14,7 @@ const { ensureOnlyExpectedMutativeFunctions } = require('./helpers');
 // 	constants: { ZERO_ADDRESS },
 // } = require('../..');
 
-contract('ImportableRewardEscrowV2 @ovm-skip', async accounts => {
+contract('ImportableRewardEscrowV2', async accounts => {
 	const [, owner, account1] = accounts;
 	let importableRewardEscrowV2;