From 2111a9422a3576c095c4c649bd39e417508b5a01 Mon Sep 17 00:00:00 2001 From: Pavel Date: Tue, 20 Aug 2024 12:52:18 +0200 Subject: [PATCH] test: refactoring return lic check --- .github/workflows/api-e2e.yml | 2 +- .github/workflows/nodejs-license.yaml | 6 +++--- packages/data-fetcher/.env.example | 2 +- .../src/playbook/contracts/InitialMultiTransfer.sol | 2 +- .../integration-tests/src/playbook/deploy/deploy-greeter.ts | 1 - .../src/playbook/scenarios/deploy/deployERC20toL1.ts | 3 +-- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/api-e2e.yml b/.github/workflows/api-e2e.yml index eee3bb60e2..37f532e6df 100644 --- a/.github/workflows/api-e2e.yml +++ b/.github/workflows/api-e2e.yml @@ -56,4 +56,4 @@ jobs: - name: Stop containers if: always() - run: docker compose -f "docker-compose.e2e.yaml" down \ No newline at end of file + run: docker compose -f "docker-compose.e2e.yaml" down diff --git a/.github/workflows/nodejs-license.yaml b/.github/workflows/nodejs-license.yaml index f159cc75a7..eabec348eb 100644 --- a/.github/workflows/nodejs-license.yaml +++ b/.github/workflows/nodejs-license.yaml @@ -65,6 +65,6 @@ jobs: - name: Install dependencies run: npm ci - # - name: Check licenses in ${{ matrix.dir }} - # working-directory: ${{ matrix.dir }} - # run: npx license-checker --json --onlyAllow "$ALLOWED_LICENSES" --exclude chai-as-promised --excludePackages "$EXCLUDE_PACKAGES" + - name: Check licenses in ${{ matrix.dir }} + working-directory: ${{ matrix.dir }} + run: npx license-checker --json --onlyAllow="$ALLOWED_LICENSES" --excludePackages "$EXCLUDE_PACKAGES" diff --git a/packages/data-fetcher/.env.example b/packages/data-fetcher/.env.example index c264631f7d..439f7be644 100644 --- a/packages/data-fetcher/.env.example +++ b/packages/data-fetcher/.env.example @@ -12,4 +12,4 @@ RPC_CALLS_RETRIES_MAX_TOTAL_TIMEOUT=12000 RPC_CALLS_CONNECTION_TIMEOUT=6000 RPC_CALLS_CONNECTION_QUICK_TIMEOUT=10000 -MAX_BLOCKS_BATCH_SIZE=20 \ No newline at end of file +MAX_BLOCKS_BATCH_SIZE=20 diff --git a/packages/integration-tests/src/playbook/contracts/InitialMultiTransfer.sol b/packages/integration-tests/src/playbook/contracts/InitialMultiTransfer.sol index a7301ef4df..9970afb6c5 100644 --- a/packages/integration-tests/src/playbook/contracts/InitialMultiTransfer.sol +++ b/packages/integration-tests/src/playbook/contracts/InitialMultiTransfer.sol @@ -60,4 +60,4 @@ contract TokenF2L2 { } } } -} \ No newline at end of file +} diff --git a/packages/integration-tests/src/playbook/deploy/deploy-greeter.ts b/packages/integration-tests/src/playbook/deploy/deploy-greeter.ts index 6ac49047fd..c8594c77aa 100644 --- a/packages/integration-tests/src/playbook/deploy/deploy-greeter.ts +++ b/packages/integration-tests/src/playbook/deploy/deploy-greeter.ts @@ -1,7 +1,6 @@ import { Deployer } from "@matterlabs/hardhat-zksync-deploy"; import { promises as fs } from "fs"; -// import { localConfig } from "../../config"; import { Buffer } from "../../entities"; import getWallet from "../utils/getWallet"; diff --git a/packages/integration-tests/src/playbook/scenarios/deploy/deployERC20toL1.ts b/packages/integration-tests/src/playbook/scenarios/deploy/deployERC20toL1.ts index 73dcc81341..5860c7bc50 100644 --- a/packages/integration-tests/src/playbook/scenarios/deploy/deployERC20toL1.ts +++ b/packages/integration-tests/src/playbook/scenarios/deploy/deployERC20toL1.ts @@ -7,9 +7,8 @@ export const deployERC20toL1 = async function () { const bufferFile = playbookRoot + "/" + Buffer.L1; await helper.executeScript(`cd ${playbookRoot} && npm run compile`); - await helper.delay(1500); await helper.executeScript(`cd ${playbookRoot} && npm run deployToL1`); - await helper.delay(1500); + const deployedToken = await helper.getStringFromFile(bufferFile); console.log("The custom ERC20 token has been deployed to L1: ", Logger.textSeparator, deployedToken);