Fixes

Author: eternauta1337

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

@@ -7,6 +7,7 @@ const {
 
 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('connect', 'Connect already deployed l1 and l2 instances before running the tests')
 	.setAction(async (taskArguments, hre) => {
 		hre.config.paths.tests = './test/integration/dual/';
 
@@ -27,11 +28,10 @@ task('test:integration:dual', 'run integrated layer 1 and layer 2 production tes
 
 			await compileInstance({ useOvm: true });
 			await deployInstance({ useOvm: true, providerUrl, providerPort: providerPortL2 });
-
-			await connectInstances({ providerUrl, providerPortL1, providerPortL2 });
 		}
 
 		if (taskArguments.connect) {
+			await connectInstances({ providerUrl, providerPortL1, providerPortL2 });
 		}
 
 		await hre.run('test', taskArguments);

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

@@ -2,7 +2,8 @@ const { task } = require('hardhat/config');
 const { compileInstance, deployInstance } = require('../../test/integration/utils/deploy');
 
 task('test:integration:l1', 'run isolated layer 1 production tests')
-	.addFlag('deploy', 'Deploy an l1 instance before running tests')
+	.addFlag('compile', 'Compile an l1 instance before running the tests')
+	.addFlag('deploy', 'Deploy an l1 instance before running the tests')
 	.setAction(async (taskArguments, hre) => {
 		hre.config.paths.tests = './test/integration/l1/';
 
@@ -16,8 +17,11 @@ task('test:integration:l1', 'run isolated layer 1 production tests')
 
 		taskArguments.maxMemory = true;
 
-		if (taskArguments.deploy) {
+		if (taskArguments.compile) {
 			await compileInstance({ useOvm: false });
+		}
+
+		if (taskArguments.deploy) {
 			await deployInstance({ useOvm: false, providerUrl, providerPort });
 		}
 

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

@@ -2,7 +2,8 @@ const { task } = require('hardhat/config');
 const { compileInstance, deployInstance } = require('../../test/integration/utils/deploy');
 
 task('test:integration:l2', 'run isolated layer 2 production tests')
-	.addFlag('deploy', 'Deploy an l2 instance before running tests')
+	.addFlag('compile', 'Compile an l2 instance before running the tests')
+	.addFlag('deploy', 'Deploy an l2 instance before running the tests')
 	.setAction(async (taskArguments, hre) => {
 		hre.config.paths.tests = './test/integration/l2/';
 
@@ -16,9 +17,12 @@ task('test:integration:l2', 'run isolated layer 2 production tests')
 
 		taskArguments.maxMemory = true;
 
+		if (taskArguments.compile) {
+			await compileInstance({ useOvm: true });
+		}
+
 		if (taskArguments.deploy) {
-			await compileInstance({ useOvm: false });
-			await deployInstance({ useOvm: false, providerUrl, providerPort });
+			await deployInstance({ useOvm: true, providerUrl, providerPort });
 		}
 
 		await hre.run('test', taskArguments);

test/integration/utils/deploy.js

@@ -7,6 +7,10 @@ const commands = {
 	connectBridge: require('../../../publish/src/commands/connect-bridge').connectBridge,
 };
 
+const {
+	constants: { OVM_MAX_GAS_LIMIT },
+} = require('../../../.');
+
 async function compileInstance({ useOvm }) {
 	await commands.build({
 		useOvm,
@@ -24,11 +28,11 @@ async function deployInstance({ useOvm, providerUrl, providerPort }) {
 		freshDeploy: true,
 		yes: true,
 		providerUrl: `${providerUrl}:${providerPort}`,
-		gasPrice: '1',
-		useOvm: false,
+		gasPrice: useOvm ? '0' : '1',
+		useOvm,
 		privateKey,
 		methodCallGasLimit: '3500000',
-		contractDeploymentGasLimit: '9500000',
+		contractDeploymentGasLimit: useOvm ? OVM_MAX_GAS_LIMIT : '9500000',
 		ignoreCustomParameters: false,
 	});
 }