close connections in other test files

web3 · Oct 21, 2024 · f0c36ff · f0c36ff
1 parent c700d82
commit f0c36ff
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 13 deletions.
diff --git a/packages/web3-eth-contract/test/integration/contract_accesslist.test.ts b/packages/web3-eth-contract/test/integration/contract_accesslist.test.ts
@@ -23,6 +23,7 @@ import {
 	describeIf,
 	getSystemTestBackend,
 	BACKEND,
+	closeOpenConnection,
 } from '../fixtures/system_test_utils';
 
 describe('contract', () => {
@@ -46,6 +47,10 @@ describe('contract', () => {
 			sendOptions = { from: acc.address, gas: '1000000' };
 		});
 
+		afterAll(async () => {
+			await closeOpenConnection(contract);
+		});
+
 		it('create access list for setter', async () => {
 			const deployedContract = await contract.deploy(deployOptions).send(sendOptions);
 			deployedContract.defaultAccount = acc.address;

diff --git a/packages/web3-eth-contract/test/integration/contract_defaults.test.ts b/packages/web3-eth-contract/test/integration/contract_defaults.test.ts
@@ -20,7 +20,11 @@ import { Web3Context } from 'web3-core';
 
 import { Contract } from '../../src';
 import { GreeterBytecode, GreeterAbi } from '../shared_fixtures/build/Greeter';
-import { getSystemTestProvider, createTempAccount } from '../fixtures/system_test_utils';
+import {
+	getSystemTestProvider,
+	createTempAccount,
+	closeOpenConnection,
+} from '../fixtures/system_test_utils';
 
 describe('contract', () => {
 	describe('defaults', () => {
@@ -43,6 +47,10 @@ describe('contract', () => {
 			sendOptions = { from: acc.address, gas: '1000000' };
 		});
 
+		afterAll(async () => {
+			await closeOpenConnection(contract);
+		});
+
 		it('should use "defaultAccount" on "instance" level instead of "from"', async () => {
 			const deployedContract = await contract.deploy(deployOptions).send(sendOptions);
 			// eslint-disable-next-line prefer-destructuring

diff --git a/packages/web3-eth-contract/test/integration/contract_defaults_extra.test.ts b/packages/web3-eth-contract/test/integration/contract_defaults_extra.test.ts
@@ -59,7 +59,7 @@ describe('contract defaults (extra)', () => {
 		sendOptions = { from: acc.address, gas: '1000000' };
 	});
 
-	afterEach(async () => {
+	afterAll(async () => {
 		await closeOpenConnection(contract);
 	});
 

diff --git a/packages/web3-eth-contract/test/integration/contract_empty_string.test.ts b/packages/web3-eth-contract/test/integration/contract_empty_string.test.ts
@@ -16,13 +16,18 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { Contract } from '../../src';
-import { getSystemTestProvider, createTempAccount } from '../fixtures/system_test_utils';
+import {
+	getSystemTestProvider,
+	createTempAccount,
+	closeOpenConnection,
+} from '../fixtures/system_test_utils';
 import { MyContractAbi, MyContractBytecode } from '../fixtures/MyContract';
 
 describe('request empty string from contract', () => {
 	let contract: Contract<typeof MyContractAbi>;
 	let deployOptions: Record<string, unknown>;
 	let sendOptions: Record<string, unknown>;
+
 	beforeAll(async () => {
 		contract = new Contract(MyContractAbi, undefined, {
 			provider: getSystemTestProvider(),
@@ -37,6 +42,10 @@ describe('request empty string from contract', () => {
 		sendOptions = { from: acc.address, gas: '1000000' };
 	});
 
+	afterAll(async () => {
+		await closeOpenConnection(contract);
+	});
+
 	it('should fetch empty string', async () => {
 		const deployedContract = await contract.deploy(deployOptions).send(sendOptions);
 

diff --git a/packages/web3-eth-contract/test/integration/contract_erc20.test.ts b/packages/web3-eth-contract/test/integration/contract_erc20.test.ts
@@ -80,10 +80,6 @@ describe('contract', () => {
 				contractDeployed = await contract.deploy(deployOptions).send(sendOptions);
 			});
 
-			afterAll(async () => {
-				await closeOpenConnection(contractDeployed);
-			});
-
 			describe('methods', () => {
 				it('should return the name', async () => {
 					expect(await contractDeployed.methods.name().call()).toBe('Gold');

diff --git a/packages/web3-eth-contract/test/integration/contract_erc721.test.ts b/packages/web3-eth-contract/test/integration/contract_erc721.test.ts
@@ -54,7 +54,6 @@ describe('contract', () => {
 
 		afterAll(async () => {
 			await closeOpenConnection(contract);
-			await closeOpenConnection(contractDeployed);
 		});
 
 		it('should deploy the contract', async () => {

diff --git a/packages/web3-eth-contract/test/integration/contract_events.test.ts b/packages/web3-eth-contract/test/integration/contract_events.test.ts
@@ -43,7 +43,6 @@ describe('contract', () => {
 
 	afterAll(async () => {
 		await closeOpenConnection(contract);
-		await closeOpenConnection(contractDeployed);
 	});
 
 	beforeEach(async () => {

diff --git a/...ion/local_account/contract_deploy.test.ts → ...ration/local_account/contract_deploy.x.ts b/...ion/local_account/contract_deploy.test.ts → ...ration/local_account/contract_deploy.x.ts
@@ -20,7 +20,11 @@ import Web3 from 'web3';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { Web3Account } from 'web3-eth-accounts';
 import { GreeterBytecode, GreeterAbi } from '../../shared_fixtures/build/Greeter';
-import { getSystemTestProvider, createLocalAccount } from '../../fixtures/system_test_utils';
+import {
+	getSystemTestProvider,
+	createLocalAccount,
+	closeOpenConnection,
+} from '../../fixtures/system_test_utils';
 import { Contract } from '../../../src';
 
 describe('contract', () => {
@@ -45,6 +49,10 @@ describe('contract', () => {
 			};
 		});
 
+		afterAll(async () => {
+			await closeOpenConnection(contract);
+		});
+
 		it.each(['0x1', '0x2'])('should emit the "sending" event', async txType => {
 			const handler = jest.fn();
 			const acc = await createLocalAccount(web3);

diff --git a/packages/web3-eth-contract/test/integration/local_account/contract_erc20.test.ts b/packages/web3-eth-contract/test/integration/local_account/contract_erc20.test.ts
@@ -21,7 +21,11 @@ import Web3 from 'web3';
 import { Web3Account } from 'web3-eth-accounts';
 import { Contract } from '../../../src';
 import { ERC20TokenAbi, ERC20TokenBytecode } from '../../shared_fixtures/build/ERC20Token';
-import { getSystemTestProvider, createLocalAccount } from '../../fixtures/system_test_utils';
+import {
+	getSystemTestProvider,
+	createLocalAccount,
+	closeOpenConnection,
+} from '../../fixtures/system_test_utils';
 
 const initialSupply = BigInt('5000000000');
 
@@ -53,6 +57,10 @@ describe('contract', () => {
 			contractDeployed = await contract.deploy(deployOptions).send(sendOptions);
 		});
 
+		afterAll(async () => {
+			await closeOpenConnection(contract);
+		});
+
 		it('should deploy the contract', () => {
 			expect(contractDeployed.options.address).toBeDefined();
 		});

diff --git a/packages/web3-eth-contract/test/integration/local_account/contract_erc721.test.ts b/packages/web3-eth-contract/test/integration/local_account/contract_erc721.test.ts
@@ -21,7 +21,11 @@ import Web3 from 'web3';
 import { Web3Account } from 'web3-eth-accounts';
 import { Contract } from '../../../src';
 import { ERC721TokenAbi, ERC721TokenBytecode } from '../../shared_fixtures/build/ERC721Token';
-import { getSystemTestProvider, createLocalAccount } from '../../fixtures/system_test_utils';
+import {
+	getSystemTestProvider,
+	createLocalAccount,
+	closeOpenConnection,
+} from '../../fixtures/system_test_utils';
 import { toUpperCaseHex } from '../../shared_fixtures/utils';
 
 describe('contract', () => {
@@ -32,6 +36,7 @@ describe('contract', () => {
 		let localAccount: Web3Account;
 		let web3: Web3;
 		let contractDeployed: Contract<typeof ERC721TokenAbi>;
+
 		beforeAll(async () => {
 			web3 = new Web3(getSystemTestProvider());
 			localAccount = await createLocalAccount(web3);
@@ -53,6 +58,10 @@ describe('contract', () => {
 				.send({ ...sendOptions, gas: '3000000' });
 		});
 
+		afterAll(async () => {
+			await closeOpenConnection(contract);
+		});
+
 		it('should deploy the contract', () => {
 			expect(contractDeployed.options.address).toBeDefined();
 		});

diff --git a/...ages/web3-eth-contract/test/integration/local_account/contract_overloaded_methods.test.ts b/...ages/web3-eth-contract/test/integration/local_account/contract_overloaded_methods.test.ts
@@ -23,7 +23,11 @@ import { utf8ToHex } from 'web3-utils';
 import { EventLog } from 'web3-types';
 import { Contract } from '../../../src';
 import { ERC721TokenAbi, ERC721TokenBytecode } from '../../shared_fixtures/build/ERC721Token';
-import { getSystemTestProvider, createLocalAccount } from '../../fixtures/system_test_utils';
+import {
+	getSystemTestProvider,
+	createLocalAccount,
+	closeOpenConnection,
+} from '../../fixtures/system_test_utils';
 import { toUpperCaseHex } from '../../shared_fixtures/utils';
 
 describe('contract ERC721 overloaded functions', () => {
@@ -55,6 +59,10 @@ describe('contract ERC721 overloaded functions', () => {
 			.send({ ...sendOptions, gas: '3000000' });
 	});
 
+	afterAll(async () => {
+		await closeOpenConnection(contract);
+	});
+
 	it('transferFrom with 4 arguments', async () => {
 		const tempAccount = await createLocalAccount(web3);
 		const toAccount = await createLocalAccount(web3);