From 13804431b7d07c6b37c1bac5919806229f69e941 Mon Sep 17 00:00:00 2001 From: pcheremu Date: Thu, 7 Mar 2024 12:17:53 +0100 Subject: [PATCH] test: update entities to constants name --- packages/integration-tests/README.md | 4 ++-- packages/integration-tests/src/config.ts | 2 +- packages/integration-tests/src/{entities.ts => constants.ts} | 0 packages/integration-tests/src/helper.ts | 2 +- .../integration-tests/src/playbook/deploy/deploy-greeter.ts | 2 +- .../integration-tests/src/playbook/deploy/deploy-paymaster.ts | 2 +- packages/integration-tests/src/playbook/deploy/erc20toL1.ts | 2 +- packages/integration-tests/src/playbook/deploy/erc20toL2.ts | 2 +- .../integration-tests/src/playbook/deploy/multiTransferETH.ts | 2 +- .../integration-tests/src/playbook/deploy/multicallCaller.ts | 2 +- .../integration-tests/src/playbook/deploy/multicallMiddle.ts | 2 +- .../integration-tests/src/playbook/deploy/multicallRoot.ts | 2 +- packages/integration-tests/src/playbook/deploy/nftToL1.ts | 2 +- packages/integration-tests/src/playbook/deploy/nftToL2.ts | 2 +- packages/integration-tests/src/playbook/deploy/use-greeter.ts | 4 ++-- .../integration-tests/src/playbook/deploy/use-multiCall.ts | 2 +- .../src/playbook/deploy/use-multitransferETH.ts | 2 +- .../integration-tests/src/playbook/deploy/use-paymaster.ts | 2 +- .../src/playbook/scenarios/deploy/deployERC20toL1.ts | 2 +- .../src/playbook/scenarios/deploy/deployERC20toL2.ts | 2 +- .../src/playbook/scenarios/deploy/deployGreeterToL2.ts | 2 +- .../src/playbook/scenarios/deploy/deployMulticallContracts.ts | 2 +- .../src/playbook/scenarios/deploy/deployMultitransferETH.ts | 2 +- .../src/playbook/scenarios/deploy/deployNFTtoL1.ts | 2 +- .../src/playbook/scenarios/deploy/deployNFTtoL2.ts | 2 +- .../src/playbook/scenarios/deploy/deployViaPaymaster.ts | 2 +- .../src/playbook/scenarios/deposit/depositERC20.ts | 2 +- .../src/playbook/scenarios/deposit/depositETH.ts | 2 +- .../src/playbook/scenarios/transfers/transferERC20.ts | 2 +- .../src/playbook/scenarios/transfers/transferETH.ts | 2 +- .../src/playbook/scenarios/transfers/transferFailedState.ts | 2 +- .../src/playbook/scenarios/transfers/useGreeter.ts | 2 +- .../src/playbook/scenarios/transfers/useMultiCall.ts | 2 +- .../src/playbook/scenarios/transfers/useMultitransferETH.ts | 2 +- .../src/playbook/scenarios/transfers/usePaymaster.ts | 2 +- .../src/playbook/scenarios/withdrawal/withdrawERC20.ts | 2 +- .../scenarios/withdrawal/withdrawERC20toOtherAddress.ts | 2 +- .../src/playbook/scenarios/withdrawal/withdrawETH.ts | 2 +- .../scenarios/withdrawal/withdrawETHtoOtherAddress.ts | 2 +- packages/integration-tests/src/playbook/utils/getWallet.ts | 2 +- packages/integration-tests/tests/api/accounts.test.ts | 2 +- packages/integration-tests/tests/api/addresses.test.ts | 2 +- packages/integration-tests/tests/api/contracts.test.ts | 2 +- packages/integration-tests/tests/api/logs.test.ts | 2 +- packages/integration-tests/tests/api/tokens.test.ts | 2 +- packages/integration-tests/tests/api/transactions.test.ts | 2 +- packages/integration-tests/tests/hooks/global.ts | 2 +- packages/integration-tests/tests/ui/deposit.spec.ts | 2 +- packages/integration-tests/tests/ui/multiCall.spec.ts | 2 +- packages/integration-tests/tests/ui/nft.spec.ts | 2 +- packages/integration-tests/tests/ui/transactions.spec.ts | 2 +- 51 files changed, 52 insertions(+), 52 deletions(-) rename packages/integration-tests/src/{entities.ts => constants.ts} (100%) diff --git a/packages/integration-tests/README.md b/packages/integration-tests/README.md index e989cf1693..494310f4dd 100644 --- a/packages/integration-tests/README.md +++ b/packages/integration-tests/README.md @@ -15,7 +15,7 @@ npm install cp .env.example packages/integration-tests/src/playbook/.env ``` -- Add your private wallet key to `WALLET_PRIVATE_KEY={YOUR_PRIVATE_KEY}`. By default we use `richWalletPrivateKey` private key in `integration-tests/src/playbook/utils/getWallet.ts` from `integration-tests/src/entities.ts`. +- Add your private wallet key to `WALLET_PRIVATE_KEY={YOUR_PRIVATE_KEY}`. By default we use `richWalletPrivateKey` private key in `integration-tests/src/playbook/utils/getWallet.ts` from `integration-tests/src/constants.ts`. ## Preparing a local environment @@ -48,7 +48,7 @@ If you need to exclude some specific test/suite, you can change keywords `it` to The test solution contains two main folders: [src](./src) and [tests](./tests). [src](./src) folder contains: - essential [scenarios](./src/playbook/scenarios/) -- predefined [entities](./src/entities.ts) and [config](./src/config.ts) config files +- predefined [constants](./src/constants.ts) and [config](./src/config.ts) config files - [contracts](./src/playbook/contracts/) folder with a set of contracts - [deploy](./src/playbook/deploy/) folder with a set of deploy scripts - [buffer](./src/playbook/buffer/) folder as a temporary storage of transaction hashes and addresses diff --git a/packages/integration-tests/src/config.ts b/packages/integration-tests/src/config.ts index fd139570c2..561f6b9694 100644 --- a/packages/integration-tests/src/config.ts +++ b/packages/integration-tests/src/config.ts @@ -1,4 +1,4 @@ -import { Wallets } from "./entities"; +import { Wallets } from "./constants"; export const localConfig = { gasLimit: { gasLimit: 10000000 }, diff --git a/packages/integration-tests/src/entities.ts b/packages/integration-tests/src/constants.ts similarity index 100% rename from packages/integration-tests/src/entities.ts rename to packages/integration-tests/src/constants.ts diff --git a/packages/integration-tests/src/helper.ts b/packages/integration-tests/src/helper.ts index 7f4a97c8c7..6342a76f86 100644 --- a/packages/integration-tests/src/helper.ts +++ b/packages/integration-tests/src/helper.ts @@ -6,7 +6,7 @@ import * as request from "supertest"; import { Provider } from "zksync-web3"; import { environment, localConfig } from "./config"; -import { Logger } from "./entities"; +import { Logger } from "./constants"; import type { BaseProvider } from "@ethersproject/providers/src.ts/base-provider"; diff --git a/packages/integration-tests/src/playbook/deploy/deploy-greeter.ts b/packages/integration-tests/src/playbook/deploy/deploy-greeter.ts index ae4d4d9da6..c9291e7c6e 100644 --- a/packages/integration-tests/src/playbook/deploy/deploy-greeter.ts +++ b/packages/integration-tests/src/playbook/deploy/deploy-greeter.ts @@ -2,7 +2,7 @@ import { Deployer } from "@matterlabs/hardhat-zksync-deploy"; import { promises as fs } from "fs"; import { localConfig } from "../../config"; -import { Buffer } from "../../entities"; +import { Buffer } from "../../constants"; import getWallet from "../utils/getWallet"; import type { HardhatRuntimeEnvironment } from "hardhat/types"; diff --git a/packages/integration-tests/src/playbook/deploy/deploy-paymaster.ts b/packages/integration-tests/src/playbook/deploy/deploy-paymaster.ts index 468e7cc9d5..7c82c1f8b3 100644 --- a/packages/integration-tests/src/playbook/deploy/deploy-paymaster.ts +++ b/packages/integration-tests/src/playbook/deploy/deploy-paymaster.ts @@ -3,7 +3,7 @@ import * as ethers from "ethers"; import { promises as fs } from "fs"; import { Wallet } from "zksync-web3"; -import { Buffer, Wallets } from "../../entities"; +import { Buffer, Wallets } from "../../constants"; import type { HardhatRuntimeEnvironment } from "hardhat/types"; diff --git a/packages/integration-tests/src/playbook/deploy/erc20toL1.ts b/packages/integration-tests/src/playbook/deploy/erc20toL1.ts index 63b7b72200..b675e55207 100644 --- a/packages/integration-tests/src/playbook/deploy/erc20toL1.ts +++ b/packages/integration-tests/src/playbook/deploy/erc20toL1.ts @@ -2,7 +2,7 @@ import { promises as fs } from "fs"; import { ethers } from "hardhat"; import { localConfig } from "../../config"; -import { Buffer, Wallets } from "../../entities"; +import { Buffer, Wallets } from "../../constants"; async function main() { const [deployer] = await ethers.getSigners(); diff --git a/packages/integration-tests/src/playbook/deploy/erc20toL2.ts b/packages/integration-tests/src/playbook/deploy/erc20toL2.ts index cbebe93761..13964be03f 100644 --- a/packages/integration-tests/src/playbook/deploy/erc20toL2.ts +++ b/packages/integration-tests/src/playbook/deploy/erc20toL2.ts @@ -2,7 +2,7 @@ import { Deployer } from "@matterlabs/hardhat-zksync-deploy"; import { promises as fs } from "fs"; import { localConfig } from "../../config"; -import { Buffer } from "../../entities"; +import { Buffer } from "../../constants"; import getWallet from "../utils/getWallet"; import type { HardhatRuntimeEnvironment } from "hardhat/types"; diff --git a/packages/integration-tests/src/playbook/deploy/multiTransferETH.ts b/packages/integration-tests/src/playbook/deploy/multiTransferETH.ts index 73b1924d62..6a8dd60492 100644 --- a/packages/integration-tests/src/playbook/deploy/multiTransferETH.ts +++ b/packages/integration-tests/src/playbook/deploy/multiTransferETH.ts @@ -1,7 +1,7 @@ import { Deployer } from "@matterlabs/hardhat-zksync-deploy"; import { promises as fs } from "fs"; -import { Buffer, Wallets } from "../../entities"; +import { Buffer, Wallets } from "../../constants"; import verify from "../utils/displayVerificationInfo"; import getWallet from "../utils/getWallet"; diff --git a/packages/integration-tests/src/playbook/deploy/multicallCaller.ts b/packages/integration-tests/src/playbook/deploy/multicallCaller.ts index d609e8e28a..d88d228e6d 100644 --- a/packages/integration-tests/src/playbook/deploy/multicallCaller.ts +++ b/packages/integration-tests/src/playbook/deploy/multicallCaller.ts @@ -1,7 +1,7 @@ import { Deployer } from "@matterlabs/hardhat-zksync-deploy"; import { promises as fs } from "fs"; -import { Buffer } from "../../entities"; +import { Buffer } from "../../constants"; import { Helper } from "../../helper"; import getWallet from "../utils/getWallet"; diff --git a/packages/integration-tests/src/playbook/deploy/multicallMiddle.ts b/packages/integration-tests/src/playbook/deploy/multicallMiddle.ts index c4feb61249..7eb8e9ad99 100644 --- a/packages/integration-tests/src/playbook/deploy/multicallMiddle.ts +++ b/packages/integration-tests/src/playbook/deploy/multicallMiddle.ts @@ -1,7 +1,7 @@ import { Deployer } from "@matterlabs/hardhat-zksync-deploy"; import { promises as fs } from "fs"; -import { Buffer } from "../../entities"; +import { Buffer } from "../../constants"; import { Helper } from "../../helper"; import getWallet from "../utils/getWallet"; diff --git a/packages/integration-tests/src/playbook/deploy/multicallRoot.ts b/packages/integration-tests/src/playbook/deploy/multicallRoot.ts index b0236342a9..d06b991af9 100644 --- a/packages/integration-tests/src/playbook/deploy/multicallRoot.ts +++ b/packages/integration-tests/src/playbook/deploy/multicallRoot.ts @@ -1,7 +1,7 @@ import { Deployer } from "@matterlabs/hardhat-zksync-deploy"; import { promises as fs } from "fs"; -import { Buffer } from "../../entities"; +import { Buffer } from "../../constants"; import getWallet from "../utils/getWallet"; import type { HardhatRuntimeEnvironment } from "hardhat/types"; diff --git a/packages/integration-tests/src/playbook/deploy/nftToL1.ts b/packages/integration-tests/src/playbook/deploy/nftToL1.ts index fb1af7d58b..c08f68dfb8 100644 --- a/packages/integration-tests/src/playbook/deploy/nftToL1.ts +++ b/packages/integration-tests/src/playbook/deploy/nftToL1.ts @@ -2,7 +2,7 @@ import { promises as fs } from "fs"; import { ethers } from "hardhat"; import * as hardhatConfig from "hardhat"; -import { Buffer, Wallets } from "../../entities"; +import { Buffer, Wallets } from "../../constants"; import type { HardhatRuntimeEnvironment } from "hardhat/types"; diff --git a/packages/integration-tests/src/playbook/deploy/nftToL2.ts b/packages/integration-tests/src/playbook/deploy/nftToL2.ts index 6ae5c15547..4b90bc5073 100644 --- a/packages/integration-tests/src/playbook/deploy/nftToL2.ts +++ b/packages/integration-tests/src/playbook/deploy/nftToL2.ts @@ -1,7 +1,7 @@ import { Deployer } from "@matterlabs/hardhat-zksync-deploy"; import { promises as fs } from "fs"; -import { Buffer, Wallets } from "../../entities"; +import { Buffer, Wallets } from "../../constants"; import displayVerificationInfo from "../utils/displayVerificationInfo"; import getWallet from "../utils/getWallet"; diff --git a/packages/integration-tests/src/playbook/deploy/use-greeter.ts b/packages/integration-tests/src/playbook/deploy/use-greeter.ts index d11a3b6610..3b07fcbe85 100644 --- a/packages/integration-tests/src/playbook/deploy/use-greeter.ts +++ b/packages/integration-tests/src/playbook/deploy/use-greeter.ts @@ -3,8 +3,8 @@ import { promises as fs } from "fs"; import { Provider, Wallet } from "zksync-web3"; import { localConfig } from "../../config"; -import { Wallets } from "../../entities"; -import { Buffer } from "../../entities"; +import { Wallets } from "../../constants"; +import { Buffer } from "../../constants"; import { Helper } from "../../helper"; import type { HardhatRuntimeEnvironment } from "hardhat/types"; diff --git a/packages/integration-tests/src/playbook/deploy/use-multiCall.ts b/packages/integration-tests/src/playbook/deploy/use-multiCall.ts index 5941892677..9df21e5fb6 100644 --- a/packages/integration-tests/src/playbook/deploy/use-multiCall.ts +++ b/packages/integration-tests/src/playbook/deploy/use-multiCall.ts @@ -3,7 +3,7 @@ import { promises as fs } from "fs"; import { Provider } from "zksync-web3"; import { localConfig } from "../../config"; -import { Buffer } from "../../entities"; +import { Buffer } from "../../constants"; import { Helper } from "../../helper"; import getWallet from "../utils/getWallet"; diff --git a/packages/integration-tests/src/playbook/deploy/use-multitransferETH.ts b/packages/integration-tests/src/playbook/deploy/use-multitransferETH.ts index b28765f570..4eafe6cb14 100644 --- a/packages/integration-tests/src/playbook/deploy/use-multitransferETH.ts +++ b/packages/integration-tests/src/playbook/deploy/use-multitransferETH.ts @@ -3,7 +3,7 @@ import { promises as fs } from "fs"; import { Provider, Wallet } from "zksync-web3"; import { localConfig } from "../../config"; -import { Buffer, Token, Wallets } from "../../entities"; +import { Buffer, Token, Wallets } from "../../constants"; import { Helper } from "../../helper"; import type { HardhatRuntimeEnvironment } from "hardhat/types"; diff --git a/packages/integration-tests/src/playbook/deploy/use-paymaster.ts b/packages/integration-tests/src/playbook/deploy/use-paymaster.ts index c98d397eaa..64a760f322 100644 --- a/packages/integration-tests/src/playbook/deploy/use-paymaster.ts +++ b/packages/integration-tests/src/playbook/deploy/use-paymaster.ts @@ -3,7 +3,7 @@ import { promises as fs } from "fs"; import { Provider, utils, Wallet } from "zksync-web3"; import { localConfig } from "../../config"; -import { Buffer } from "../../entities"; +import { Buffer } from "../../constants"; import { Helper } from "../../helper"; import type { HardhatRuntimeEnvironment } from "hardhat/types"; diff --git a/packages/integration-tests/src/playbook/scenarios/deploy/deployERC20toL1.ts b/packages/integration-tests/src/playbook/scenarios/deploy/deployERC20toL1.ts index 5860c7bc50..bea9cab022 100644 --- a/packages/integration-tests/src/playbook/scenarios/deploy/deployERC20toL1.ts +++ b/packages/integration-tests/src/playbook/scenarios/deploy/deployERC20toL1.ts @@ -1,4 +1,4 @@ -import { Buffer, Logger } from "../../../entities"; +import { Buffer, Logger } from "../../../constants"; import { Helper } from "../../../helper"; export const deployERC20toL1 = async function () { diff --git a/packages/integration-tests/src/playbook/scenarios/deploy/deployERC20toL2.ts b/packages/integration-tests/src/playbook/scenarios/deploy/deployERC20toL2.ts index 469ae20867..d893ce7e2a 100644 --- a/packages/integration-tests/src/playbook/scenarios/deploy/deployERC20toL2.ts +++ b/packages/integration-tests/src/playbook/scenarios/deploy/deployERC20toL2.ts @@ -1,4 +1,4 @@ -import { Buffer, Logger } from "../../../entities"; +import { Buffer, Logger } from "../../../constants"; import { Helper } from "../../../helper"; export const deployERC20toL2 = async function () { diff --git a/packages/integration-tests/src/playbook/scenarios/deploy/deployGreeterToL2.ts b/packages/integration-tests/src/playbook/scenarios/deploy/deployGreeterToL2.ts index 934b175849..85ee571822 100644 --- a/packages/integration-tests/src/playbook/scenarios/deploy/deployGreeterToL2.ts +++ b/packages/integration-tests/src/playbook/scenarios/deploy/deployGreeterToL2.ts @@ -1,4 +1,4 @@ -import { Buffer, Logger } from "../../../entities"; +import { Buffer, Logger } from "../../../constants"; import { Helper } from "../../../helper"; let deployedContract: string; diff --git a/packages/integration-tests/src/playbook/scenarios/deploy/deployMulticallContracts.ts b/packages/integration-tests/src/playbook/scenarios/deploy/deployMulticallContracts.ts index bded14535f..5414e0a948 100644 --- a/packages/integration-tests/src/playbook/scenarios/deploy/deployMulticallContracts.ts +++ b/packages/integration-tests/src/playbook/scenarios/deploy/deployMulticallContracts.ts @@ -1,4 +1,4 @@ -import { Buffer } from "../../../entities"; +import { Buffer } from "../../../constants"; import { Helper } from "../../../helper"; export const deployMulticallContracts = async function () { diff --git a/packages/integration-tests/src/playbook/scenarios/deploy/deployMultitransferETH.ts b/packages/integration-tests/src/playbook/scenarios/deploy/deployMultitransferETH.ts index f86b1a1e73..2a5112cd6b 100644 --- a/packages/integration-tests/src/playbook/scenarios/deploy/deployMultitransferETH.ts +++ b/packages/integration-tests/src/playbook/scenarios/deploy/deployMultitransferETH.ts @@ -1,4 +1,4 @@ -import { Buffer } from "../../../entities"; +import { Buffer } from "../../../constants"; import { Helper } from "../../../helper"; export const deployMultitransferETH = async function () { diff --git a/packages/integration-tests/src/playbook/scenarios/deploy/deployNFTtoL1.ts b/packages/integration-tests/src/playbook/scenarios/deploy/deployNFTtoL1.ts index ad59eb971a..25ab4f3756 100644 --- a/packages/integration-tests/src/playbook/scenarios/deploy/deployNFTtoL1.ts +++ b/packages/integration-tests/src/playbook/scenarios/deploy/deployNFTtoL1.ts @@ -1,4 +1,4 @@ -import { Buffer, Logger } from "../../../entities"; +import { Buffer, Logger } from "../../../constants"; import { Helper } from "../../../helper"; export const deployNFTtoL1 = async function () { diff --git a/packages/integration-tests/src/playbook/scenarios/deploy/deployNFTtoL2.ts b/packages/integration-tests/src/playbook/scenarios/deploy/deployNFTtoL2.ts index 25925e28b0..856e2f48df 100644 --- a/packages/integration-tests/src/playbook/scenarios/deploy/deployNFTtoL2.ts +++ b/packages/integration-tests/src/playbook/scenarios/deploy/deployNFTtoL2.ts @@ -1,4 +1,4 @@ -import { Buffer, Logger } from "../../../entities"; +import { Buffer, Logger } from "../../../constants"; import { Helper } from "../../../helper"; export const deployNFTtoL2 = async function () { diff --git a/packages/integration-tests/src/playbook/scenarios/deploy/deployViaPaymaster.ts b/packages/integration-tests/src/playbook/scenarios/deploy/deployViaPaymaster.ts index d047685687..71a1807344 100644 --- a/packages/integration-tests/src/playbook/scenarios/deploy/deployViaPaymaster.ts +++ b/packages/integration-tests/src/playbook/scenarios/deploy/deployViaPaymaster.ts @@ -1,4 +1,4 @@ -import { Buffer } from "../../../entities"; +import { Buffer } from "../../../constants"; import { Helper } from "../../../helper"; export const deployViaPaymaster = async function () { diff --git a/packages/integration-tests/src/playbook/scenarios/deposit/depositERC20.ts b/packages/integration-tests/src/playbook/scenarios/deposit/depositERC20.ts index 0d3a48d1cb..ab36021949 100644 --- a/packages/integration-tests/src/playbook/scenarios/deposit/depositERC20.ts +++ b/packages/integration-tests/src/playbook/scenarios/deposit/depositERC20.ts @@ -3,7 +3,7 @@ import { promises as fs } from "fs"; import * as zksync from "zksync-web3"; import { localConfig } from "../../../config"; -import { Buffer, Logger, Wallets } from "../../../entities"; +import { Buffer, Logger, Wallets } from "../../../constants"; import { Helper } from "../../../helper"; const helper = new Helper(); diff --git a/packages/integration-tests/src/playbook/scenarios/deposit/depositETH.ts b/packages/integration-tests/src/playbook/scenarios/deposit/depositETH.ts index f15e27b30b..c5d966adc7 100644 --- a/packages/integration-tests/src/playbook/scenarios/deposit/depositETH.ts +++ b/packages/integration-tests/src/playbook/scenarios/deposit/depositETH.ts @@ -3,7 +3,7 @@ import { promises as fs } from "fs"; import * as zksync from "zksync-web3"; import { localConfig } from "../../../config"; -import { Buffer, Logger } from "../../../entities"; +import { Buffer, Logger } from "../../../constants"; import { Helper } from "../../../helper"; export const depositEth = async function (sum = "0.000009") { diff --git a/packages/integration-tests/src/playbook/scenarios/transfers/transferERC20.ts b/packages/integration-tests/src/playbook/scenarios/transfers/transferERC20.ts index 80f19d3905..8b8e524694 100644 --- a/packages/integration-tests/src/playbook/scenarios/transfers/transferERC20.ts +++ b/packages/integration-tests/src/playbook/scenarios/transfers/transferERC20.ts @@ -3,7 +3,7 @@ import { promises as fs } from "fs"; import * as zksync from "zksync-web3"; import { localConfig } from "../../../config"; -import { Buffer, Logger, Wallets } from "../../../entities"; +import { Buffer, Logger, Wallets } from "../../../constants"; import { Helper } from "../../../helper"; export const transferERC20 = async function (sum: string, tokenAddress: string, tokenName?: string /*, units = 18*/) { diff --git a/packages/integration-tests/src/playbook/scenarios/transfers/transferETH.ts b/packages/integration-tests/src/playbook/scenarios/transfers/transferETH.ts index fdd21c6e51..6367b87a3a 100644 --- a/packages/integration-tests/src/playbook/scenarios/transfers/transferETH.ts +++ b/packages/integration-tests/src/playbook/scenarios/transfers/transferETH.ts @@ -3,7 +3,7 @@ import { promises as fs } from "fs"; import * as zksync from "zksync-web3"; import { localConfig } from "../../../config"; -import { Buffer, Logger, Wallets } from "../../../entities"; +import { Buffer, Logger, Wallets } from "../../../constants"; import { Helper } from "../../../helper"; export const transferEth = async function (sum = "0.000009", address: string = Wallets.mainWalletPrivateKey) { diff --git a/packages/integration-tests/src/playbook/scenarios/transfers/transferFailedState.ts b/packages/integration-tests/src/playbook/scenarios/transfers/transferFailedState.ts index c798cf6a61..29ae716d39 100644 --- a/packages/integration-tests/src/playbook/scenarios/transfers/transferFailedState.ts +++ b/packages/integration-tests/src/playbook/scenarios/transfers/transferFailedState.ts @@ -3,7 +3,7 @@ import { promises as fs } from "fs"; import * as zksync from "zksync-web3"; import { localConfig } from "../../../config"; -import { Buffer, Logger } from "../../../entities"; +import { Buffer, Logger } from "../../../constants"; import { Helper } from "../../../helper"; export const transferFailedState = async function (tokenAddress: string, tokenName?: string) { diff --git a/packages/integration-tests/src/playbook/scenarios/transfers/useGreeter.ts b/packages/integration-tests/src/playbook/scenarios/transfers/useGreeter.ts index f9f77d2e36..03f05fb217 100644 --- a/packages/integration-tests/src/playbook/scenarios/transfers/useGreeter.ts +++ b/packages/integration-tests/src/playbook/scenarios/transfers/useGreeter.ts @@ -1,4 +1,4 @@ -import { Buffer } from "../../../entities"; +import { Buffer } from "../../../constants"; import { Helper } from "../../../helper"; export const useGreeter = async function () { diff --git a/packages/integration-tests/src/playbook/scenarios/transfers/useMultiCall.ts b/packages/integration-tests/src/playbook/scenarios/transfers/useMultiCall.ts index 6abde94494..c17807d568 100644 --- a/packages/integration-tests/src/playbook/scenarios/transfers/useMultiCall.ts +++ b/packages/integration-tests/src/playbook/scenarios/transfers/useMultiCall.ts @@ -1,4 +1,4 @@ -import { Buffer } from "../../../entities"; +import { Buffer } from "../../../constants"; import { Helper } from "../../../helper"; export const useMultiCallContracts = async function () { diff --git a/packages/integration-tests/src/playbook/scenarios/transfers/useMultitransferETH.ts b/packages/integration-tests/src/playbook/scenarios/transfers/useMultitransferETH.ts index 40ed959414..31b2917654 100644 --- a/packages/integration-tests/src/playbook/scenarios/transfers/useMultitransferETH.ts +++ b/packages/integration-tests/src/playbook/scenarios/transfers/useMultitransferETH.ts @@ -1,4 +1,4 @@ -import { Buffer } from "../../../entities"; +import { Buffer } from "../../../constants"; import { Helper } from "../../../helper"; export const useMultitransferETH = async function () { diff --git a/packages/integration-tests/src/playbook/scenarios/transfers/usePaymaster.ts b/packages/integration-tests/src/playbook/scenarios/transfers/usePaymaster.ts index 8c667be1c5..cce46c4bc1 100644 --- a/packages/integration-tests/src/playbook/scenarios/transfers/usePaymaster.ts +++ b/packages/integration-tests/src/playbook/scenarios/transfers/usePaymaster.ts @@ -1,4 +1,4 @@ -import { Buffer } from "../../../entities"; +import { Buffer } from "../../../constants"; import { Helper } from "../../../helper"; export const usePaymaster = async function () { diff --git a/packages/integration-tests/src/playbook/scenarios/withdrawal/withdrawERC20.ts b/packages/integration-tests/src/playbook/scenarios/withdrawal/withdrawERC20.ts index 7bcb910033..ecd33fe152 100644 --- a/packages/integration-tests/src/playbook/scenarios/withdrawal/withdrawERC20.ts +++ b/packages/integration-tests/src/playbook/scenarios/withdrawal/withdrawERC20.ts @@ -3,7 +3,7 @@ import { promises as fs } from "fs"; import * as zksync from "zksync-web3"; import { localConfig } from "../../../config"; -import { Buffer, Logger, Wallets } from "../../../entities"; +import { Buffer, Logger, Wallets } from "../../../constants"; import { Helper } from "../../../helper"; export const withdrawERC20 = async function (tokenAddress: string, sum = "0.2") { diff --git a/packages/integration-tests/src/playbook/scenarios/withdrawal/withdrawERC20toOtherAddress.ts b/packages/integration-tests/src/playbook/scenarios/withdrawal/withdrawERC20toOtherAddress.ts index cf377733b6..66de2badc9 100644 --- a/packages/integration-tests/src/playbook/scenarios/withdrawal/withdrawERC20toOtherAddress.ts +++ b/packages/integration-tests/src/playbook/scenarios/withdrawal/withdrawERC20toOtherAddress.ts @@ -3,7 +3,7 @@ import { promises as fs } from "fs"; import * as zksync from "zksync-web3"; import { localConfig } from "../../../config"; -import { Buffer, Logger, Wallets } from "../../../entities"; +import { Buffer, Logger, Wallets } from "../../../constants"; import { Helper } from "../../../helper"; export const withdrawERC20toOtherAddress = async function (tokenAddress: string, sum = "0.2") { diff --git a/packages/integration-tests/src/playbook/scenarios/withdrawal/withdrawETH.ts b/packages/integration-tests/src/playbook/scenarios/withdrawal/withdrawETH.ts index 5c2598a6d6..4bd76049ab 100644 --- a/packages/integration-tests/src/playbook/scenarios/withdrawal/withdrawETH.ts +++ b/packages/integration-tests/src/playbook/scenarios/withdrawal/withdrawETH.ts @@ -3,7 +3,7 @@ import { promises as fs } from "fs"; import * as zksync from "zksync-web3"; import { localConfig } from "../../../config"; -import { Buffer, Logger } from "../../../entities"; +import { Buffer, Logger } from "../../../constants"; import { Helper } from "../../../helper"; export const withdrawETH = async function (sum = "0.000009") { diff --git a/packages/integration-tests/src/playbook/scenarios/withdrawal/withdrawETHtoOtherAddress.ts b/packages/integration-tests/src/playbook/scenarios/withdrawal/withdrawETHtoOtherAddress.ts index 6adde5510c..f4ed657ae0 100644 --- a/packages/integration-tests/src/playbook/scenarios/withdrawal/withdrawETHtoOtherAddress.ts +++ b/packages/integration-tests/src/playbook/scenarios/withdrawal/withdrawETHtoOtherAddress.ts @@ -3,7 +3,7 @@ import { promises as fs } from "fs"; import * as zksync from "zksync-web3"; import { localConfig } from "../../../config"; -import { Buffer, Logger, Wallets } from "../../../entities"; +import { Buffer, Logger, Wallets } from "../../../constants"; import { Helper } from "../../../helper"; export const withdrawETHtoOtherAddress = async function (sum = "0.000009") { diff --git a/packages/integration-tests/src/playbook/utils/getWallet.ts b/packages/integration-tests/src/playbook/utils/getWallet.ts index c956b5148e..cee3ccef70 100644 --- a/packages/integration-tests/src/playbook/utils/getWallet.ts +++ b/packages/integration-tests/src/playbook/utils/getWallet.ts @@ -1,7 +1,7 @@ import { getDefaultProvider, utils } from "ethers"; import { Provider, Wallet } from "zksync-web3"; -import { Wallets } from "../../entities"; +import { Wallets } from "../../constants"; // eslint-disable-next-line @typescript-eslint/no-explicit-any export default async function (hre: any) { diff --git a/packages/integration-tests/tests/api/accounts.test.ts b/packages/integration-tests/tests/api/accounts.test.ts index 11440a8520..065363a605 100644 --- a/packages/integration-tests/tests/api/accounts.test.ts +++ b/packages/integration-tests/tests/api/accounts.test.ts @@ -2,7 +2,7 @@ import * as request from "supertest"; import { environment } from "../../src/config"; import { localConfig } from "../../src/config"; -import { Buffer, Token, Wallets } from "../../src/entities"; +import { Buffer, Token, Wallets } from "../../src/constants"; import { Helper } from "../../src/helper"; import { Playbook } from "../../src/playbook/playbook"; diff --git a/packages/integration-tests/tests/api/addresses.test.ts b/packages/integration-tests/tests/api/addresses.test.ts index daf65881a3..8b26ea85a1 100644 --- a/packages/integration-tests/tests/api/addresses.test.ts +++ b/packages/integration-tests/tests/api/addresses.test.ts @@ -1,5 +1,5 @@ import { localConfig } from "../../src/config"; -import { Buffer, Token, Wallets } from "../../src/entities"; +import { Buffer, Token, Wallets } from "../../src/constants"; import { Helper } from "../../src/helper"; import { Playbook } from "../../src/playbook/playbook"; diff --git a/packages/integration-tests/tests/api/contracts.test.ts b/packages/integration-tests/tests/api/contracts.test.ts index c1b984bcb3..09169f6db4 100644 --- a/packages/integration-tests/tests/api/contracts.test.ts +++ b/packages/integration-tests/tests/api/contracts.test.ts @@ -1,5 +1,5 @@ import { localConfig } from "../../src/config"; -import { Buffer, Wallets } from "../../src/entities"; +import { Buffer, Wallets } from "../../src/constants"; import { Helper } from "../../src/helper"; import { Playbook } from "../../src/playbook/playbook"; diff --git a/packages/integration-tests/tests/api/logs.test.ts b/packages/integration-tests/tests/api/logs.test.ts index 7edbcbf30d..ff881c81ec 100644 --- a/packages/integration-tests/tests/api/logs.test.ts +++ b/packages/integration-tests/tests/api/logs.test.ts @@ -1,5 +1,5 @@ import { localConfig } from "../../src/config"; -import { Buffer } from "../../src/entities"; +import { Buffer } from "../../src/constants"; import { Helper } from "../../src/helper"; import { Playbook } from "../../src/playbook/playbook"; diff --git a/packages/integration-tests/tests/api/tokens.test.ts b/packages/integration-tests/tests/api/tokens.test.ts index 60c2375ef5..cea4b6a50e 100644 --- a/packages/integration-tests/tests/api/tokens.test.ts +++ b/packages/integration-tests/tests/api/tokens.test.ts @@ -1,5 +1,5 @@ import { localConfig } from "../../src/config"; -import { Buffer, Token, TransactionsType, Wallets } from "../../src/entities"; +import { Buffer, Token, TransactionsType, Wallets } from "../../src/constants"; import { Helper } from "../../src/helper"; import { Playbook } from "../../src/playbook/playbook"; diff --git a/packages/integration-tests/tests/api/transactions.test.ts b/packages/integration-tests/tests/api/transactions.test.ts index 16e975652a..fef4d32a84 100644 --- a/packages/integration-tests/tests/api/transactions.test.ts +++ b/packages/integration-tests/tests/api/transactions.test.ts @@ -1,5 +1,5 @@ import { localConfig } from "../../src/config"; -import { Buffer, Token, TransactionStatus, TransactionsType, Wallets } from "../../src/entities"; +import { Buffer, Token, TransactionStatus, TransactionsType, Wallets } from "../../src/constants"; import { Helper } from "../../src/helper"; import { Playbook } from "../../src/playbook/playbook"; diff --git a/packages/integration-tests/tests/hooks/global.ts b/packages/integration-tests/tests/hooks/global.ts index 2512d8878f..0ec0903f5c 100644 --- a/packages/integration-tests/tests/hooks/global.ts +++ b/packages/integration-tests/tests/hooks/global.ts @@ -1,4 +1,4 @@ -import { Buffer } from "../../src/entities"; +import { Buffer } from "../../src/constants"; import { Helper } from "../../src/helper"; import { Playbook } from "../../src/playbook/playbook"; diff --git a/packages/integration-tests/tests/ui/deposit.spec.ts b/packages/integration-tests/tests/ui/deposit.spec.ts index 5d6f5f2431..57aac180cf 100644 --- a/packages/integration-tests/tests/ui/deposit.spec.ts +++ b/packages/integration-tests/tests/ui/deposit.spec.ts @@ -1,7 +1,7 @@ import { expect, test } from "@playwright/test"; import { config } from "./config"; -import { BlockExplorer, Buffer, Wallets } from "../../src/entities"; +import { BlockExplorer, Buffer, Wallets } from "../../src/constants"; import { Helper } from "../../src/helper"; import type { Locator } from "@playwright/test"; diff --git a/packages/integration-tests/tests/ui/multiCall.spec.ts b/packages/integration-tests/tests/ui/multiCall.spec.ts index 38e723834d..bd7607943f 100644 --- a/packages/integration-tests/tests/ui/multiCall.spec.ts +++ b/packages/integration-tests/tests/ui/multiCall.spec.ts @@ -1,7 +1,7 @@ import { expect, test } from "@playwright/test"; import { config } from "./config"; -import { BlockExplorer, Buffer } from "../../src/entities"; +import { BlockExplorer, Buffer } from "../../src/constants"; import { Helper } from "../../src/helper"; import type { Locator } from "@playwright/test"; diff --git a/packages/integration-tests/tests/ui/nft.spec.ts b/packages/integration-tests/tests/ui/nft.spec.ts index 2e301ed232..ea24620a62 100644 --- a/packages/integration-tests/tests/ui/nft.spec.ts +++ b/packages/integration-tests/tests/ui/nft.spec.ts @@ -1,7 +1,7 @@ import { expect, test } from "@playwright/test"; import { config } from "./config"; -import { BlockExplorer, Buffer } from "../../src/entities"; +import { BlockExplorer, Buffer } from "../../src/constants"; import { Helper } from "../../src/helper"; import type { Locator } from "@playwright/test"; diff --git a/packages/integration-tests/tests/ui/transactions.spec.ts b/packages/integration-tests/tests/ui/transactions.spec.ts index 22f923bf1e..8ac394b2ff 100644 --- a/packages/integration-tests/tests/ui/transactions.spec.ts +++ b/packages/integration-tests/tests/ui/transactions.spec.ts @@ -1,7 +1,7 @@ import { expect, test } from "@playwright/test"; import { config } from "./config"; -import { BlockExplorer, Buffer } from "../../src/entities"; +import { BlockExplorer, Buffer } from "../../src/constants"; import { Helper } from "../../src/helper"; import type { Locator } from "@playwright/test";