Enables separate folder compilation for integration tests (#1322)

* Enables separate folder compilation for integration tests

* Clean install

Author: eternauta1337

.circleci/config.yml

@@ -89,7 +89,7 @@ jobs:
       - run:
           name: Run dual layer 1 and layer 2 integration tests
           command: |
-            npx hardhat test:integration:dual --deploy
+            npx hardhat test:integration:dual --deploy-evm --deploy-ovm --connect
   job-lint:
     working_directory: ~/repo
     docker:

.circleci/src/jobs/job-integration-tests.yml

@@ -41,4 +41,4 @@ steps:
   - run:
       name: Run dual layer 1 and layer 2 integration tests
       command: |
-        npx hardhat test:integration:dual --deploy
+        npx hardhat test:integration:dual --deploy-evm --deploy-ovm --connect

.gitignore

@@ -5,7 +5,6 @@ deploy_settings.py
 
 # gitignore - Truffle proj
 .idea/
-build
 bin/
 node_modules
 yarn-error.log
@@ -17,7 +16,7 @@ site/
 .env
 
 # Build artifacts
-flattened-contracts/
+build*/
 
 # For eth-gas-reporter in tests
 test-gas-used.log

hardhat/tasks/task-test-integration-dual.js

@@ -1,3 +1,7 @@
+const path = require('path');
+const {
+	constants: { BUILD_FOLDER },
+} = require('../..');
 const { task } = require('hardhat/config');
 const {
 	compileInstance,
@@ -6,28 +10,58 @@ const {
 } = require('../../test/integration/utils/deploy');
 
 task('test:integration:dual', 'run integrated layer 1 and layer 2 production tests')
-	.addFlag('deploy', 'Deploy l1 and l2 instances before running the tests')
+	.addFlag('compileEvm', 'Compile the l1 instance before running the tests')
+	.addFlag('compileOvm', 'Compile the l2 instance before running the tests')
+	.addFlag('deployEvm', 'Deploy the l1 instance before running the tests')
+	.addFlag('deployOvm', 'Deploy the l2 instance before running the tests')
+	.addFlag('connect', 'Connect deployed l1 and l2 instances before running the tests')
+	.addOptionalParam('buildPathEvm', 'The target build path for the evm artifacts')
+	.addOptionalParam('buildPathOvm', 'The target build path for the ovm artifacts')
 	.setAction(async (taskArguments, hre) => {
 		hre.config.paths.tests = './test/integration/dual/';
 
 		const providerUrl = (hre.config.providerUrl = 'http://localhost');
 		const providerPortL1 = (hre.config.providerPortL1 = '9545');
 		const providerPortL2 = (hre.config.providerPortL2 = '8545');
+		const buildPathEvm =
+			taskArguments.buildPathEvm || path.join(__dirname, '..', '..', BUILD_FOLDER);
+		const buildPathOvm =
+			taskArguments.buildPathOvm || path.join(__dirname, '..', '..', `${BUILD_FOLDER}-ovm`);
 
 		const timeout = 600000; // 10m
 		hre.config.mocha.timeout = timeout;
-		hre.config.mocha.bail = false;
+		hre.config.mocha.bail = true;
 		hre.config.networks.localhost.timeout = timeout;
 
 		taskArguments.maxMemory = true;
 
-		if (taskArguments.deploy) {
-			await compileInstance({ useOvm: false });
-			await deployInstance({ useOvm: false, providerUrl, providerPort: providerPortL1 });
+		if (taskArguments.compileEvm) {
+			await compileInstance({ useOvm: false, buildPath: buildPathEvm });
+		}
+
+		if (taskArguments.compileOvm) {
+			await compileInstance({ useOvm: true, buildPath: buildPathEvm });
+		}
 
-			await compileInstance({ useOvm: true });
-			await deployInstance({ useOvm: true, providerUrl, providerPort: providerPortL2 });
+		if (taskArguments.deployEvm) {
+			await deployInstance({
+				useOvm: false,
+				providerUrl,
+				providerPort: providerPortL1,
+				buildPath: buildPathEvm,
+			});
+		}
+
+		if (taskArguments.deployOvm) {
+			await deployInstance({
+				useOvm: true,
+				providerUrl,
+				providerPort: providerPortL2,
+				buildPath: buildPathOvm,
+			});
+		}
 
+		if (taskArguments.connect) {
 			await connectInstances({ providerUrl, providerPortL1, providerPortL2 });
 		}
 

hardhat/tasks/task-test-integration-l1.js

@@ -1,3 +1,7 @@
+const path = require('path');
+const {
+	constants: { BUILD_FOLDER },
+} = require('../..');
 const { task } = require('hardhat/config');
 const {
 	compileInstance,
@@ -9,6 +13,7 @@ task('test:integration:l1', 'run isolated layer 1 production tests')
 	.addFlag('compile', 'Compile an l1 instance before running the tests')
 	.addFlag('deploy', 'Deploy an l1 instance before running the tests')
 	.addFlag('fork', 'Run the tests against a fork of mainnet')
+	.addOptionalParam('buildPath', 'The target build path for the evm artifacts')
 	.addOptionalParam(
 		'providerPort',
 		'The target port for the running local chain to test on',
@@ -19,17 +24,18 @@ task('test:integration:l1', 'run isolated layer 1 production tests')
 
 		const providerUrl = (hre.config.providerUrl = 'http://localhost');
 		const providerPort = (hre.config.providerPort = taskArguments.providerPort);
+		const buildPath = taskArguments.buildPath || path.join(__dirname, '..', '..', BUILD_FOLDER);
 
 		const timeout = 600000; // 10m
 		hre.config.mocha.timeout = timeout;
-		hre.config.mocha.bail = false;
+		hre.config.mocha.bail = true;
 		hre.config.networks.localhost.timeout = timeout;
 		hre.config.fork = taskArguments.fork;
 
 		taskArguments.maxMemory = true;
 
 		if (taskArguments.compile) {
-			await compileInstance({ useOvm: false });
+			await compileInstance({ useOvm: false, buildPath });
 		}
 
 		if (taskArguments.deploy) {
@@ -42,9 +48,10 @@ task('test:integration:l1', 'run isolated layer 1 production tests')
 					freshDeploy: false,
 					providerUrl,
 					providerPort,
+					buildPath,
 				});
 			} else {
-				await deployInstance({ useOvm: false, providerUrl, providerPort });
+				await deployInstance({ useOvm: false, providerUrl, providerPort, buildPath });
 			}
 		}
 

hardhat/tasks/task-test-integration-l2.js

@@ -1,3 +1,7 @@
+const path = require('path');
+const {
+	constants: { BUILD_FOLDER },
+} = require('../..');
 const { task } = require('hardhat/config');
 const { compileInstance, deployInstance } = require('../../test/integration/utils/deploy');
 
@@ -9,28 +13,32 @@ task('test:integration:l2', 'run isolated layer 2 production tests')
 		'The target port for the running local chain to test on',
 		'8545'
 	)
+	.addOptionalParam('buildPath', 'The target build path for the ovm artifacts')
 	.setAction(async (taskArguments, hre) => {
 		hre.config.paths.tests = './test/integration/l2/';
 
 		const providerUrl = (hre.config.providerUrl = 'http://localhost');
 		const providerPort = (hre.config.providerPort = taskArguments.providerPort);
+		const buildPath =
+			taskArguments.buildPath || path.join(__dirname, '..', '..', `${BUILD_FOLDER}-ovm`);
 
 		const timeout = 600000; // 10m
 		hre.config.mocha.timeout = timeout;
-		hre.config.mocha.bail = false;
+		hre.config.mocha.bail = true;
 		hre.config.networks.localhost.timeout = timeout;
 
 		taskArguments.maxMemory = true;
 
 		if (taskArguments.compile) {
-			await compileInstance({ useOvm: true });
+			await compileInstance({ useOvm: true, buildPath });
 		}
 
 		if (taskArguments.deploy) {
 			await deployInstance({
 				useOvm: true,
 				providerUrl,
 				providerPort,
+				buildPath,
 			});
 		}