test: update folder structure, calls and folder names

matter-labs · Oct 4, 2023 · 1e23ccd · 1e23ccd
1 parent 1da9fcb
commit 1e23ccd
Show file tree

Hide file tree

Showing 78 changed files with 14 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ This repository is a monorepo consisting of 3 packages:
 - [API](./packages/api) - a service providing Web API for retrieving structured [zkSync Era](https://zksync.io) blockchain data collected by [Worker](./packages/worker). It connects to the Worker's database to be able to query the collected data.
 - [App](./packages/app) - a front-end app providing an easy-to-use interface for users to view and inspect transactions, blocks, contracts and more. It makes requests to the [API](./packages/api) to get the data and presents it in a way that's easy to read and understand.
 
-Also the repository contains [integration-test](./integration-tests) folder with a set of sdk-ui/sdk-api tests. Follow this [Readme](./integration-tests/README.md) for more details.
+Also the repository contains [integration-test](./integration-tests) folder with a set of ui/api tests. Follow this [Readme](./integration-tests/README.md) for more details.
 
 ## 🏛 Architecture
 The following diagram illustrates how are the block explorer components connected:

diff --git a/package.json b/package.json
@@ -8,17 +8,16 @@
   "repository": "https://github.com/matter-labs/block-explorer",
   "private": true,
   "workspaces": [
-    "packages/*",
-    "integration-tests"
+    "packages/*"
   ],
   "scripts": {
     "prepare": "husky install",
     "lint": "lerna run lint",
     "test": "lerna run test",
     "test:ci": "lerna run test:ci",
     "test:e2e": "lerna run test:e2e",
-    "test:sdk-ui": "lerna run test:sdk-ui",
-    "test:sdk-api": "lerna run test:sdk-api",
+    "test:ui": "lerna run test:ui",
+    "test:api": "lerna run test:api",
     "dev": "lerna run dev",
     "build": "lerna run build",
     "start": "lerna run start",

diff --git a/integration-tests/.commitlintrc.json → ...ages/integration-tests/.commitlintrc.json b/integration-tests/.commitlintrc.json → ...ages/integration-tests/.commitlintrc.json
diff --git a/integration-tests/.eslintrc.js → packages/integration-tests/.eslintrc.js b/integration-tests/.eslintrc.js → packages/integration-tests/.eslintrc.js
diff --git a/integration-tests/.gitignore → packages/integration-tests/.gitignore b/integration-tests/.gitignore → packages/integration-tests/.gitignore
diff --git a/integration-tests/README.md → packages/integration-tests/README.md b/integration-tests/README.md → packages/integration-tests/README.md
@@ -19,19 +19,19 @@ Before the test run, there needs to spin a local environment up:
 docker-compose -f docker-compose.yaml up
 ```
 
-## How to run sdk-api tests
+## How to run api tests
 --
 all tests:
 
 ```bash
-npm run test:sdk-api 
+npm run test:api 
 ```
-## How to run sdk-ui tests
+## How to run ui tests
 --
 all tests:
 
 ```bash
-npm run test:sdk-ui 
+npm run test:ui 
 ```
 
 If there is a necessity to run the exact test or/and suite you need change 
@@ -50,8 +50,8 @@ The test solution contains two main folders: [src](./src) and [tests](./tests).
 - [utils](./src/playbook/utils/) folder with utils scripts
 
 [tests](./tests) folder contains sets of:
-- [sdk-api](./tests/sdk-api/) endpoints tests, that cover an essential part of [worker](../packages/worker/) and [api](../packages/api/) functionality
-- [sdk-ui](./tests/sdk-ui/) UI tests. that cover an essential part of [BE UI](../packages/app/) functionality
+- [api](./tests/api/) endpoints tests, that cover an essential part of [worker](../packages/worker/) and [api](../packages/api/) functionality
+- [ui](./tests/ui/) UI tests. that cover an essential part of [BE UI](../packages/app/) functionality
 
 
 The presented logic/code (/utils, /deploy, /contracts) of custom ERC20 token deployment has been taking from

diff --git a/integration-tests/jest.config.json → packages/integration-tests/jest.config.json b/integration-tests/jest.config.json → packages/integration-tests/jest.config.json
diff --git a/integration-tests/package-lock.json → packages/integration-tests/package-lock.json b/integration-tests/package-lock.json → packages/integration-tests/package-lock.json
diff --git a/integration-tests/package.json → packages/integration-tests/package.json b/integration-tests/package.json → packages/integration-tests/package.json
@@ -9,8 +9,8 @@
   "license": "MIT",
   "scripts": {
     "postinstall": "cd src/playbook && npm install",
-    "test:sdk-api": "jest --verbose",
-    "test:sdk-ui": "npx playwright test",
+    "test:api": "jest --verbose",
+    "test:ui": "npx playwright test",
     "dev:be": "docker-compose -f docker-compose.yaml up\n",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore --ignore-pattern 'repos' --ignore-pattern 'git add .'"
   },

diff --git a/integration-tests/playwright.config.ts → ...es/integration-tests/playwright.config.ts b/integration-tests/playwright.config.ts → ...es/integration-tests/playwright.config.ts
@@ -1,8 +1,8 @@
 import { defineConfig, devices } from "@playwright/test";
-import { config } from "tests/sdk-ui/config";
+import { config } from "tests/ui/config";
 
 export default defineConfig({
-  testDir: "tests/sdk-ui",
+  testDir: "tests/ui",
   fullyParallel: true,
   projects: [
     {

diff --git a/integration-tests/src/config.ts → packages/integration-tests/src/config.ts b/integration-tests/src/config.ts → packages/integration-tests/src/config.ts
diff --git a/integration-tests/src/entities.ts → packages/integration-tests/src/entities.ts b/integration-tests/src/entities.ts → packages/integration-tests/src/entities.ts
diff --git a/integration-tests/src/helper.ts → packages/integration-tests/src/helper.ts b/integration-tests/src/helper.ts → packages/integration-tests/src/helper.ts
diff --git a/...ration-tests/src/playbook/buffer/.gitkeep → ...ration-tests/src/playbook/buffer/.gitkeep b/...ration-tests/src/playbook/buffer/.gitkeep → ...ration-tests/src/playbook/buffer/.gitkeep
diff --git a/...n-tests/src/playbook/contracts/Caller.sol → ...n-tests/src/playbook/contracts/Caller.sol b/...n-tests/src/playbook/contracts/Caller.sol → ...n-tests/src/playbook/contracts/Caller.sol
diff --git a/...-tests/src/playbook/contracts/Greeter.sol → ...-tests/src/playbook/contracts/Greeter.sol b/...-tests/src/playbook/contracts/Greeter.sol → ...-tests/src/playbook/contracts/Greeter.sol
diff --git a/...ation-tests/src/playbook/contracts/L1.sol → ...ation-tests/src/playbook/contracts/L1.sol b/...ation-tests/src/playbook/contracts/L1.sol → ...ation-tests/src/playbook/contracts/L1.sol
diff --git a/...ation-tests/src/playbook/contracts/L2.sol → ...ation-tests/src/playbook/contracts/L2.sol b/...ation-tests/src/playbook/contracts/L2.sol → ...ation-tests/src/playbook/contracts/L2.sol
diff --git a/...n-tests/src/playbook/contracts/Middle.sol → ...n-tests/src/playbook/contracts/Middle.sol b/...n-tests/src/playbook/contracts/Middle.sol → ...n-tests/src/playbook/contracts/Middle.sol
diff --git a/.../src/playbook/contracts/MultiTransfer.sol → .../src/playbook/contracts/MultiTransfer.sol b/.../src/playbook/contracts/MultiTransfer.sol → .../src/playbook/contracts/MultiTransfer.sol
diff --git a/...-tests/src/playbook/contracts/MyERC20.sol → ...-tests/src/playbook/contracts/MyERC20.sol b/...-tests/src/playbook/contracts/MyERC20.sol → ...-tests/src/playbook/contracts/MyERC20.sol
diff --git a/...on-tests/src/playbook/contracts/MyNFT.sol → ...on-tests/src/playbook/contracts/MyNFT.sol b/...on-tests/src/playbook/contracts/MyNFT.sol → ...on-tests/src/playbook/contracts/MyNFT.sol
diff --git a/...ts/src/playbook/contracts/MyPaymaster.sol → ...ts/src/playbook/contracts/MyPaymaster.sol b/...ts/src/playbook/contracts/MyPaymaster.sol → ...ts/src/playbook/contracts/MyPaymaster.sol
diff --git a/...ion-tests/src/playbook/contracts/Root.sol → ...ion-tests/src/playbook/contracts/Root.sol b/...ion-tests/src/playbook/contracts/Root.sol → ...ion-tests/src/playbook/contracts/Root.sol
diff --git a/...sts/src/playbook/deploy/deploy-greeter.ts → ...sts/src/playbook/deploy/deploy-greeter.ts b/...sts/src/playbook/deploy/deploy-greeter.ts → ...sts/src/playbook/deploy/deploy-greeter.ts
diff --git a/...s/src/playbook/deploy/deploy-paymaster.ts → ...s/src/playbook/deploy/deploy-paymaster.ts b/...s/src/playbook/deploy/deploy-paymaster.ts → ...s/src/playbook/deploy/deploy-paymaster.ts
diff --git a/...on-tests/src/playbook/deploy/erc20toL1.ts → ...on-tests/src/playbook/deploy/erc20toL1.ts b/...on-tests/src/playbook/deploy/erc20toL1.ts → ...on-tests/src/playbook/deploy/erc20toL1.ts
diff --git a/...on-tests/src/playbook/deploy/erc20toL2.ts → ...on-tests/src/playbook/deploy/erc20toL2.ts b/...on-tests/src/playbook/deploy/erc20toL2.ts → ...on-tests/src/playbook/deploy/erc20toL2.ts
diff --git a/...s/src/playbook/deploy/multiTransferETH.ts → ...s/src/playbook/deploy/multiTransferETH.ts b/...s/src/playbook/deploy/multiTransferETH.ts → ...s/src/playbook/deploy/multiTransferETH.ts
diff --git a/...ts/src/playbook/deploy/multicallCaller.ts → ...ts/src/playbook/deploy/multicallCaller.ts b/...ts/src/playbook/deploy/multicallCaller.ts → ...ts/src/playbook/deploy/multicallCaller.ts
diff --git a/...ts/src/playbook/deploy/multicallMiddle.ts → ...ts/src/playbook/deploy/multicallMiddle.ts b/...ts/src/playbook/deploy/multicallMiddle.ts → ...ts/src/playbook/deploy/multicallMiddle.ts
diff --git a/...ests/src/playbook/deploy/multicallRoot.ts → ...ests/src/playbook/deploy/multicallRoot.ts b/...ests/src/playbook/deploy/multicallRoot.ts → ...ests/src/playbook/deploy/multicallRoot.ts
diff --git a/...tion-tests/src/playbook/deploy/nftToL1.ts → ...tion-tests/src/playbook/deploy/nftToL1.ts b/...tion-tests/src/playbook/deploy/nftToL1.ts → ...tion-tests/src/playbook/deploy/nftToL1.ts
diff --git a/...tion-tests/src/playbook/deploy/nftToL2.ts → ...tion-tests/src/playbook/deploy/nftToL2.ts b/...tion-tests/src/playbook/deploy/nftToL2.ts → ...tion-tests/src/playbook/deploy/nftToL2.ts
diff --git a/...-tests/src/playbook/deploy/use-greeter.ts → ...-tests/src/playbook/deploy/use-greeter.ts b/...-tests/src/playbook/deploy/use-greeter.ts → ...-tests/src/playbook/deploy/use-greeter.ts
diff --git a/...ests/src/playbook/deploy/use-multiCall.ts → ...ests/src/playbook/deploy/use-multiCall.ts b/...ests/src/playbook/deploy/use-multiCall.ts → ...ests/src/playbook/deploy/use-multiCall.ts
diff --git a/...c/playbook/deploy/use-multitransferETH.ts → ...c/playbook/deploy/use-multitransferETH.ts b/...c/playbook/deploy/use-multitransferETH.ts → ...c/playbook/deploy/use-multitransferETH.ts
diff --git a/...ests/src/playbook/deploy/use-paymaster.ts → ...ests/src/playbook/deploy/use-paymaster.ts b/...ests/src/playbook/deploy/use-paymaster.ts → ...ests/src/playbook/deploy/use-paymaster.ts
diff --git a/...tion-tests/src/playbook/hardhat.config.ts → ...tion-tests/src/playbook/hardhat.config.ts b/...tion-tests/src/playbook/hardhat.config.ts → ...tion-tests/src/playbook/hardhat.config.ts
diff --git a/...tion-tests/src/playbook/package-lock.json → ...tion-tests/src/playbook/package-lock.json b/...tion-tests/src/playbook/package-lock.json → ...tion-tests/src/playbook/package-lock.json
diff --git a/integration-tests/src/playbook/package.json → ...tegration-tests/src/playbook/package.json b/integration-tests/src/playbook/package.json → ...tegration-tests/src/playbook/package.json
diff --git a/integration-tests/src/playbook/playbook.ts → ...ntegration-tests/src/playbook/playbook.ts b/integration-tests/src/playbook/playbook.ts → ...ntegration-tests/src/playbook/playbook.ts
diff --git a/...ybook/scenarios/deploy/deployERC20toL1.ts → ...ybook/scenarios/deploy/deployERC20toL1.ts b/...ybook/scenarios/deploy/deployERC20toL1.ts → ...ybook/scenarios/deploy/deployERC20toL1.ts
diff --git a/...ybook/scenarios/deploy/deployERC20toL2.ts → ...ybook/scenarios/deploy/deployERC20toL2.ts b/...ybook/scenarios/deploy/deployERC20toL2.ts → ...ybook/scenarios/deploy/deployERC20toL2.ts
diff --git a/...ook/scenarios/deploy/deployGreeterToL2.ts → ...ook/scenarios/deploy/deployGreeterToL2.ts b/...ook/scenarios/deploy/deployGreeterToL2.ts → ...ook/scenarios/deploy/deployGreeterToL2.ts
diff --git a/...narios/deploy/deployMulticallContracts.ts → ...narios/deploy/deployMulticallContracts.ts b/...narios/deploy/deployMulticallContracts.ts → ...narios/deploy/deployMulticallContracts.ts
diff --git a/...cenarios/deploy/deployMultitransferETH.ts → ...cenarios/deploy/deployMultitransferETH.ts b/...cenarios/deploy/deployMultitransferETH.ts → ...cenarios/deploy/deployMultitransferETH.ts
diff --git a/...laybook/scenarios/deploy/deployNFTtoL1.ts → ...laybook/scenarios/deploy/deployNFTtoL1.ts b/...laybook/scenarios/deploy/deployNFTtoL1.ts → ...laybook/scenarios/deploy/deployNFTtoL1.ts
diff --git a/...laybook/scenarios/deploy/deployNFTtoL2.ts → ...laybook/scenarios/deploy/deployNFTtoL2.ts b/...laybook/scenarios/deploy/deployNFTtoL2.ts → ...laybook/scenarios/deploy/deployNFTtoL2.ts
diff --git a/...ok/scenarios/deploy/deployViaPaymaster.ts → ...ok/scenarios/deploy/deployViaPaymaster.ts b/...ok/scenarios/deploy/deployViaPaymaster.ts → ...ok/scenarios/deploy/deployViaPaymaster.ts
diff --git a/...laybook/scenarios/deposit/depositERC20.ts → ...laybook/scenarios/deposit/depositERC20.ts b/...laybook/scenarios/deposit/depositERC20.ts → ...laybook/scenarios/deposit/depositERC20.ts
diff --git a/.../playbook/scenarios/deposit/depositETH.ts → .../playbook/scenarios/deposit/depositETH.ts b/.../playbook/scenarios/deposit/depositETH.ts → .../playbook/scenarios/deposit/depositETH.ts
diff --git a/...book/scenarios/transfers/transferERC20.ts → ...book/scenarios/transfers/transferERC20.ts b/...book/scenarios/transfers/transferERC20.ts → ...book/scenarios/transfers/transferERC20.ts
diff --git a/...aybook/scenarios/transfers/transferETH.ts → ...aybook/scenarios/transfers/transferETH.ts b/...aybook/scenarios/transfers/transferETH.ts → ...aybook/scenarios/transfers/transferETH.ts
diff --git a/...cenarios/transfers/transferFailedState.ts → ...cenarios/transfers/transferFailedState.ts b/...cenarios/transfers/transferFailedState.ts → ...cenarios/transfers/transferFailedState.ts
diff --git a/...laybook/scenarios/transfers/useGreeter.ts → ...laybook/scenarios/transfers/useGreeter.ts b/...laybook/scenarios/transfers/useGreeter.ts → ...laybook/scenarios/transfers/useGreeter.ts
diff --git a/...ybook/scenarios/transfers/useMultiCall.ts → ...ybook/scenarios/transfers/useMultiCall.ts b/...ybook/scenarios/transfers/useMultiCall.ts → ...ybook/scenarios/transfers/useMultiCall.ts
diff --git a/...cenarios/transfers/useMultitransferETH.ts → ...cenarios/transfers/useMultitransferETH.ts b/...cenarios/transfers/useMultitransferETH.ts → ...cenarios/transfers/useMultitransferETH.ts
diff --git a/...ybook/scenarios/transfers/usePaymaster.ts → ...ybook/scenarios/transfers/usePaymaster.ts b/...ybook/scenarios/transfers/usePaymaster.ts → ...ybook/scenarios/transfers/usePaymaster.ts
diff --git a/...ook/scenarios/withdrawal/withdrawERC20.ts → ...ook/scenarios/withdrawal/withdrawERC20.ts b/...ook/scenarios/withdrawal/withdrawERC20.ts → ...ook/scenarios/withdrawal/withdrawERC20.ts
diff --git a/...withdrawal/withdrawERC20toOtherAddress.ts → ...withdrawal/withdrawERC20toOtherAddress.ts b/...withdrawal/withdrawERC20toOtherAddress.ts → ...withdrawal/withdrawERC20toOtherAddress.ts
diff --git a/...ybook/scenarios/withdrawal/withdrawETH.ts → ...ybook/scenarios/withdrawal/withdrawETH.ts b/...ybook/scenarios/withdrawal/withdrawETH.ts → ...ybook/scenarios/withdrawal/withdrawETH.ts
diff --git a/...s/withdrawal/withdrawETHtoOtherAddress.ts → ...s/withdrawal/withdrawETHtoOtherAddress.ts b/...s/withdrawal/withdrawETHtoOtherAddress.ts → ...s/withdrawal/withdrawETHtoOtherAddress.ts
diff --git a/...playbook/utils/displayVerificationInfo.ts → ...playbook/utils/displayVerificationInfo.ts b/...playbook/utils/displayVerificationInfo.ts → ...playbook/utils/displayVerificationInfo.ts
diff --git a/...ion-tests/src/playbook/utils/getWallet.ts → ...ion-tests/src/playbook/utils/getWallet.ts b/...ion-tests/src/playbook/utils/getWallet.ts → ...ion-tests/src/playbook/utils/getWallet.ts
diff --git a/...ation-tests/tests/sdk-api/deposit.test.ts → ...tegration-tests/tests/api/deposit.test.ts b/...ation-tests/tests/sdk-api/deposit.test.ts → ...tegration-tests/tests/api/deposit.test.ts
diff --git a/...ion-tests/tests/sdk-api/endpoints.test.ts → ...gration-tests/tests/api/endpoints.test.ts b/...ion-tests/tests/sdk-api/endpoints.test.ts → ...gration-tests/tests/api/endpoints.test.ts
diff --git a/integration-tests/tests/sdk-api/nft.test.ts → ...s/integration-tests/tests/api/nft.test.ts b/integration-tests/tests/sdk-api/nft.test.ts → ...s/integration-tests/tests/api/nft.test.ts
diff --git a/...ration-tests/tests/sdk-api/tokens.test.ts → ...ntegration-tests/tests/api/tokens.test.ts b/...ration-tests/tests/sdk-api/tokens.test.ts → ...ntegration-tests/tests/api/tokens.test.ts
diff --git a/...ts/sdk-api/transactions/multiCall.test.ts → .../tests/api/transactions/multiCall.test.ts b/...ts/sdk-api/transactions/multiCall.test.ts → .../tests/api/transactions/multiCall.test.ts
diff --git a/...dk-api/transactions/multiTransfer.test.ts → ...ts/api/transactions/multiTransfer.test.ts b/...dk-api/transactions/multiTransfer.test.ts → ...ts/api/transactions/multiTransfer.test.ts
diff --git a/.../sdk-api/transactions/transaction.test.ts → ...ests/api/transactions/transaction.test.ts b/.../sdk-api/transactions/transaction.test.ts → ...ests/api/transactions/transaction.test.ts
diff --git a/...ion-tests/tests/sdk-api/transfers.test.ts → ...gration-tests/tests/api/transfers.test.ts b/...ion-tests/tests/sdk-api/transfers.test.ts → ...gration-tests/tests/api/transfers.test.ts
diff --git a/...on-tests/tests/sdk-api/withdrawal.test.ts → ...ration-tests/tests/api/withdrawal.test.ts b/...on-tests/tests/sdk-api/withdrawal.test.ts → ...ration-tests/tests/api/withdrawal.test.ts
diff --git a/integration-tests/tests/sdk-ui/config.ts → ...ages/integration-tests/tests/ui/config.ts b/integration-tests/tests/sdk-ui/config.ts → ...ages/integration-tests/tests/ui/config.ts
diff --git a/...tion-tests/tests/sdk-ui/multiCall.spec.ts → ...egration-tests/tests/ui/multiCall.spec.ts b/...tion-tests/tests/sdk-ui/multiCall.spec.ts → ...egration-tests/tests/ui/multiCall.spec.ts
diff --git a/integration-tests/tests/sdk-ui/nft.spec.ts → ...es/integration-tests/tests/ui/nft.spec.ts b/integration-tests/tests/sdk-ui/nft.spec.ts → ...es/integration-tests/tests/ui/nft.spec.ts
diff --git a/integration-tests/tsconfig.json → packages/integration-tests/tsconfig.json b/integration-tests/tsconfig.json → packages/integration-tests/tsconfig.json