test: added providerCache for networks

packages/integration-tests/src/constants.ts

@@ -51,7 +51,6 @@ export enum Logger {
 }
 
 export enum Token {
-  // CUST_Address = "0x0928008B245A76E105E02C522b5d309c0887ecA5",// probably unused
   customL2TokenName = "L2 ERC20 token",
   customL2TokenSymbol = "L2",
   customL2TokenDecimals = 18,

packages/integration-tests/src/helper.ts

@@ -3,10 +3,12 @@ import { ethers } from "ethers";
 import { promises as fs } from "fs";
 import * as path from "path";
 import * as request from "supertest";
+import { setTimeout } from "timers/promises";
 import { Provider } from "zksync-web3";
 
 import { environment, localConfig } from "./config";
 import { Logger } from "./constants";
+import { getProviderForL1, getProviderForL2 } from "./provider";
 
 import type { BaseProvider } from "@ethersproject/providers/src.ts/base-provider";
 
@@ -38,40 +40,31 @@ export class Helper {
 
   async writeFile(filePath: string, fileName: string, data: string) {
     const absoluteRoute = path.join(filePath, fileName);
-    try {
-      await fs.writeFile(absoluteRoute, data);
-    } catch {
-      console.log(`Cannot write: ${fileName} to ${filePath}`);
-    }
+    await fs.writeFile(absoluteRoute, data);
   }
 
   async readFile(filePath: string, fileName: string) {
     const absoluteRoute = path.join(filePath, fileName);
-
-    try {
-      return await fs.readFile(absoluteRoute, { encoding: "utf-8" });
-    } catch {
-      console.log(`There is no the expected file: ${fileName} in ${filePath}`);
-    }
+    return await fs.readFile(absoluteRoute, { encoding: "utf-8" });
   }
 
   async getBalanceETH(walletAddress: string, layer: string) {
     let network: string;
     let provider: BaseProvider;
     if (layer == "L1") {
       network = localConfig.L1Network;
-      provider = ethers.getDefaultProvider(network);
+      provider = getProviderForL1(network);
     } else if (layer == "L2") {
       network = localConfig.L2Network;
-      provider = new Provider(network);
+      provider = getProviderForL2(network);
     } else {
       console.log(`Wrong layer: ${layer}`);
     }
     return ethers.utils.formatUnits(await provider.getBalance(walletAddress), "wei");
   }
 
   async delay(ms: number) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
+    await setTimeout(ms);
   }
 
   async performBlockExplorerApiGetRequest(apiRoute: string) {

packages/integration-tests/src/playbook/contracts/Caller.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
 interface IGreeter2 {

packages/integration-tests/src/playbook/contracts/Middle.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
 interface IGreeter {

packages/integration-tests/src/playbook/contracts/MyERC20.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: MIT
 
 pragma solidity ^0.8.0;
 

packages/integration-tests/src/provider.ts

@@ -0,0 +1,21 @@
+import { ethers } from "ethers";
+import { Provider } from "zksync-web3";
+
+import type { BaseProvider } from "@ethersproject/providers/src.ts/base-provider";
+
+const providerCacheL1: { [key: string]: BaseProvider } = {};
+const providerCacheL2: { [key: string]: Provider } = {};
+
+export function getProviderForL2(network: string): Provider {
+  if (!providerCacheL2[network]) {
+    providerCacheL2[network] = new Provider(network);
+  }
+  return providerCacheL2[network];
+}
+
+export function getProviderForL1(network: string): BaseProvider {
+  if (!providerCacheL1[network]) {
+    providerCacheL1[network] = ethers.getDefaultProvider(network);
+  }
+  return providerCacheL1[network];
+}

packages/integration-tests/tests/api/accounts.test.ts

@@ -98,7 +98,7 @@ describe("API module: Account", () => {
         expect(typeof response.body.result[0].isError).toStrictEqual("string");
         expect(typeof response.body.result[0].txreceipt_status).toStrictEqual("string");
         expect(typeof response.body.result[0].input).toStrictEqual("string");
-        expect(typeof response.body.result[0].contractAddress).toBeTruthy(); // can be null
+        expect(typeof response.body.result[0].contractAddress).toBeTruthy();
         expect(typeof response.body.result[0].cumulativeGasUsed).toStrictEqual("string");
         expect(typeof response.body.result[0].gasUsed).toStrictEqual("string");
         expect(typeof response.body.result[0].confirmations).toStrictEqual("string");