move to TS

Author: avkos

package.json

@@ -85,7 +85,7 @@
 		"test:blackbox:geth:ws": "yarn pre-blackbox && yarn geth:start:background && ./scripts/verdaccio.sh startBackgroundAndPublish && lerna run test:blackbox:geth:ws --stream && yarn post-blackbox:geth",
 		"test:blackbox:infura:http": "yarn pre-blackbox && ./scripts/verdaccio.sh startBackgroundAndPublish && lerna run test:blackbox:infura:http --stream && yarn post-blackbox",
 		"test:blackbox:infura:ws": "yarn pre-blackbox && ./scripts/verdaccio.sh startBackgroundAndPublish && lerna run test:blackbox:infura:ws --stream && yarn post-blackbox",
-		"test:manual:stress:data": "packages/web3/stress/large_request_data/start.sh",
+		"test:manual:stress:data": "packages/web3/test/stress/large_request_data/start.sh",
 		"test:manual:stress:requests": "packages/web3/test/stress/many_requests/start.sh",
 		"test:manual:stress:validation": "npx ts-node packages/web3/test/stress/large_validator_data/index.ts",
 		"test:manual:stress": "yarn test:manual:stress:data && yarn test:manual:stress:validation && yarn test:stress:requests",

packages/web3/test/stress/large_request_data/index.ts

@@ -16,19 +16,12 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /* eslint-disable */
-<<<<<<<< HEAD:packages/web3/test/stress/large_request_data/index.js
-const { Web3 } = require('../../../lib/commonjs');
-const { IpcProvider } = require('../../../../web3-providers-ipc/lib/commonjs');
-const accounts = require('../../../../../scripts/accounts.json');
-const contractData = require('../../../../../fixtures/build/Basic.json');
-
-========
 import { Web3 } from 'web3';
 import { IpcProvider } from 'web3-providers-ipc';
-import accounts from '../shared_fixtures/accounts.json';
-import { BasicAbi, BasicBytecode } from '../shared_fixtures/build/Basic';
+import accounts from '../../shared_fixtures/accounts.json';
+import { BasicAbi, BasicBytecode } from '../../shared_fixtures/build/Basic';
 import WebSocketProvider from 'web3-providers-ws';
->>>>>>>> ok/5563-Stress-Tests-2---QA-Tests:packages/web3/test/stress/index.ts
+
 const DATA_AMOUNT = 50 * 1024; // 50 kB
 
 const sendAndGetData = async (web3: Web3, i: number) => {

packages/web3/test/stress/large_validator_data/index.ts

@@ -16,11 +16,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /* eslint-disable */
-<<<<<<<< HEAD:packages/web3/test/stress/large_validator_data/index.js
-const { Web3Validator } = require('../../../../web3-validator/lib/commonjs');
-========
 import { Web3Validator, JsonSchema, Json } from 'web3-validator';
->>>>>>>> ok/5563-Stress-Tests-2---QA-Tests:packages/web3/test/stress/validator.ts
 
 const abi = [
 	{ indexed: true, internalType: 'address', name: 'from', type: 'address' },
@@ -107,34 +103,24 @@ const { schema: hugeSchema1000, data: hugeData1000 } = createHugeSchema(
 	1000,
 );
 
-const index = new Web3Validator();
+const validator = new Web3Validator();
 
-<<<<<<<< HEAD:packages/web3/test/stress/large_validator_data/index.js
-console.time('huge schema');
-index.validateJSONSchema(hugeSchema, hugeData);
-console.timeLog('huge schema');
-
-console.time('huge schema 1000');
-index.validateJSONSchema(hugeSchema1000, hugeData1000);
-console.timeLog('huge schema 1000');
-========
 validator.validateJSONSchema(hugeSchema, hugeData as object);
 
 validator.validateJSONSchema(hugeSchema1000, hugeData1000 as object);
->>>>>>>> ok/5563-Stress-Tests-2---QA-Tests:packages/web3/test/stress/validator.ts
 
 for (let i = 0; i < 500; i += 1) {
-	index.validateJSONSchema(simpleSchema, simpleData);
+	validator.validateJSONSchema(simpleSchema, simpleData);
 }
 
 for (let i = 0; i < 1000; i += 1) {
-	index.validateJSONSchema(simpleSchema, simpleData);
+	validator.validateJSONSchema(simpleSchema, simpleData);
 }
 
 for (let i = 0; i < 1000; i += 1) {
-	index.validateJSONSchema(abiJsonSchema, abiData);
+	validator.validateJSONSchema(abiJsonSchema, abiData);
 }
 
 for (let i = 0; i < 1000; i += 1) {
-	index.validate(abi, abiData);
+	validator.validate(abi, abiData);
 }

packages/web3/test/stress/many_requests/index.js renamed to packages/web3/test/stress/many_requests/index.ts

@@ -16,41 +16,48 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /* eslint-disable */
-const { Web3 } = require('../../../lib/commonjs');
-const { IpcProvider } = require('../../../../web3-providers-ipc/lib/commonjs');
-const contractData = require('../../../../../fixtures/build/Basic.json');
+import { Web3, Contract, Numbers, EventLog } from 'web3';
+import { IpcProvider } from 'web3-providers-ipc';
+import { BasicBytecode, BasicAbi } from '../../shared_fixtures/build/Basic';
+import { Web3Account } from 'web3-eth-accounts';
 
-const providerString = process.env.WEB3_SYSTEM_TEST_PROVIDER;
+const providerString = String(process.env.WEB3_SYSTEM_TEST_PROVIDER);
 const isWs = providerString.startsWith('ws');
 const isIpc = providerString.includes('ipc');
-const contracts = {};
+const contracts: { [key: string]: Contract<typeof BasicAbi> } = {};
 
-const deployContracts = async (web3, accounts) => {
+const deployContracts = async (web3: Web3, accounts: Web3Account[]) => {
 	const prs = [];
 	for (let i = 0; i < accounts.length; i++) {
 		const account = accounts[i];
 		const sendOptions = { from: account.address };
 		const deployOptions = {
-			data: contractData.evm.bytecode.object,
-			arguments: [123, ''],
+			data: BasicBytecode,
+			arguments: [123, ''] as [number, string],
 			gas: BigInt(9000000000000),
 			gasLimit: BigInt(9000000000000),
 			type: BigInt(0),
 		};
-		const c = new web3.eth.Contract(contractData.abi);
+		const c = new web3.eth.Contract<typeof BasicAbi>(BasicAbi);
 		prs.push(
 			c
 				.deploy(deployOptions)
 				.send(sendOptions)
-				.then(contract => {
+				.then((contract: typeof c) => {
 					contracts[account.address] = contract;
 				}),
 		);
 	}
 	await Promise.all(prs);
 };
 
-const addAccount = async (web3, mainAcc, address, privateKey, nonce) => {
+const addAccount = async (
+	web3: Web3,
+	mainAcc: string,
+	address: string,
+	privateKey: string,
+	nonce: Numbers,
+) => {
 	web3.eth.accounts.wallet.add(privateKey);
 	return web3.eth.sendTransaction({
 		from: mainAcc,
@@ -61,11 +68,11 @@ const addAccount = async (web3, mainAcc, address, privateKey, nonce) => {
 	});
 };
 
-const prepareAccounts = async (web3, n = 1000) => {
+const prepareAccounts = async (web3: Web3, n = 1000) => {
 	const prs = [];
 	const list = await web3.eth.personal.getAccounts();
 	const mainAcc = list[0];
-	const accountList = [];
+	const accountList: Web3Account[] = [];
 	const nonce = await web3.eth.getTransactionCount(mainAcc);
 	for (let i = 0; i < n; i++) {
 		const acc = web3.eth.accounts.create();
@@ -76,20 +83,20 @@ const prepareAccounts = async (web3, n = 1000) => {
 	return accountList;
 };
 
-const sendData = async (web3, account) => {
+const sendData = async (account: Web3Account) => {
 	const contract = contracts[account.address];
 	return contract.methods
 		.firesStringEvent(`String event: ${account.address}`)
 		.send({ from: account.address });
 };
 
-const getData = async (web3, account) => {
+const getData = async (account: Web3Account) => {
 	const contract = contracts[account.address];
 	await contract.methods.getStringValue().call();
 };
 
-const receivedEvents = {};
-const subscribeContract = acc => {
+const receivedEvents: { [key: string]: EventLog } = {};
+const subscribeContract = (acc: Web3Account) => {
 	const contract = contracts[acc.address];
 	const event = contract.events.StringEvent();
 
@@ -100,7 +107,7 @@ const subscribeContract = acc => {
 		receivedEvents[acc.address] = res;
 	});
 };
-const contractSubscriptions = (web3, accounts) => {
+const contractSubscriptions = (accounts: Web3Account[]) => {
 	console.log(`Subscribe to ${accounts.length} contracts events`);
 	for (const acc of accounts) {
 		subscribeContract(acc);
@@ -123,13 +130,13 @@ const test = async () => {
 	await deployContracts(web3, accounts);
 	// if socket subscribe to events
 	if (isIpc || isWs) {
-		contractSubscriptions(web3, accounts);
+		contractSubscriptions(accounts);
 	}
 
 	console.log(`Send data from ${n} accounts in parallel`);
 	const sendPrs = [];
 	for (let i = 0; i < n; i++) {
-		sendPrs.push(sendData(web3, accounts[i]));
+		sendPrs.push(sendData(accounts[i]));
 	}
 	await Promise.all(sendPrs);
 
@@ -142,11 +149,11 @@ const test = async () => {
 	console.log(`Get data from ${n} accounts in parallel`);
 	const getPrs = [];
 	for (let i = 0; i < n; i++) {
-		getPrs.push(getData(web3, accounts[i]));
+		getPrs.push(getData(accounts[i]));
 	}
 	await Promise.all(getPrs);
 	if (isIpc || isWs) {
-		web3.provider.disconnect();
+		(web3.provider as IpcProvider).disconnect();
 	}
 };
 

packages/web3/test/stress/many_requests/start.sh

@@ -2,23 +2,24 @@
 . scripts/env.sh
 
 export WEB3_SYSTEM_TEST_BACKEND="geth"
+export TS_NODE_PREFER_TS_EXTS=true
 
 ./scripts/geth_binary.sh stressStart
 export PARALLEL_COUNT=10
 export WEB3_SYSTEM_TEST_PROVIDER=$IPC_PATH
-node ./packages/web3/test/stress/many_requests/index.js
+ts-node ./packages/web3/test/stress/many_requests/index.ts
 ./scripts/geth_binary.sh stop
 
 ./scripts/geth_binary.sh stressStart
 export PARALLEL_COUNT=1000
 export WEB3_SYSTEM_TEST_PROVIDER=ws://127.0.0.1:8545
-node ./packages/web3/test/stress/many_requests/index.js
+ts-node ./packages/web3/test/stress/many_requests/index.ts
 
 
 ./scripts/geth_binary.sh stressStart
 export PARALLEL_COUNT=100
 export WEB3_SYSTEM_TEST_PROVIDER=http://127.0.0.1:8545
-node ./packages/web3/test/stress/many_requests/index.js
+ts-node ./packages/web3/test/stress/many_requests/index.ts
 ./scripts/geth_binary.sh stop