From 50a67138f80a2fb0da6ef7a25fc203eadab554ba Mon Sep 17 00:00:00 2001 From: jdevcs Date: Mon, 26 Aug 2024 13:20:06 +0200 Subject: [PATCH 1/7] timeout update --- packages/web3-core/test/config/jest.config.js | 1 + packages/web3-eth-abi/test/config/jest.config.js | 1 + packages/web3-eth-contract/test/config/jest.config.js | 1 + packages/web3-eth-personal/test/config/jest.config.js | 1 + packages/web3-net/test/config/jest.config.js | 1 + packages/web3-providers-ipc/test/config/jest.config.js | 1 + packages/web3-types/test/config/jest.config.js | 1 + packages/web3-utils/test/config/jest.config.js | 1 + packages/web3-validator/test/config/jest.config.js | 1 + packages/web3/test/config/jest.config.js | 1 + templates/jest.config.js.tmpl | 1 + 11 files changed, 11 insertions(+) diff --git a/packages/web3-core/test/config/jest.config.js b/packages/web3-core/test/config/jest.config.js index 74597df99d0..28d62955096 100644 --- a/packages/web3-core/test/config/jest.config.js +++ b/packages/web3-core/test/config/jest.config.js @@ -40,4 +40,5 @@ module.exports = { * This can be done programmatically using jest.resetModules(). */ resetModules: true, + testTimeout: 600000, }; diff --git a/packages/web3-eth-abi/test/config/jest.config.js b/packages/web3-eth-abi/test/config/jest.config.js index 74597df99d0..28d62955096 100644 --- a/packages/web3-eth-abi/test/config/jest.config.js +++ b/packages/web3-eth-abi/test/config/jest.config.js @@ -40,4 +40,5 @@ module.exports = { * This can be done programmatically using jest.resetModules(). */ resetModules: true, + testTimeout: 600000, }; diff --git a/packages/web3-eth-contract/test/config/jest.config.js b/packages/web3-eth-contract/test/config/jest.config.js index 74597df99d0..28d62955096 100644 --- a/packages/web3-eth-contract/test/config/jest.config.js +++ b/packages/web3-eth-contract/test/config/jest.config.js @@ -40,4 +40,5 @@ module.exports = { * This can be done programmatically using jest.resetModules(). */ resetModules: true, + testTimeout: 600000, }; diff --git a/packages/web3-eth-personal/test/config/jest.config.js b/packages/web3-eth-personal/test/config/jest.config.js index 74597df99d0..28d62955096 100644 --- a/packages/web3-eth-personal/test/config/jest.config.js +++ b/packages/web3-eth-personal/test/config/jest.config.js @@ -40,4 +40,5 @@ module.exports = { * This can be done programmatically using jest.resetModules(). */ resetModules: true, + testTimeout: 600000, }; diff --git a/packages/web3-net/test/config/jest.config.js b/packages/web3-net/test/config/jest.config.js index 74597df99d0..28d62955096 100644 --- a/packages/web3-net/test/config/jest.config.js +++ b/packages/web3-net/test/config/jest.config.js @@ -40,4 +40,5 @@ module.exports = { * This can be done programmatically using jest.resetModules(). */ resetModules: true, + testTimeout: 600000, }; diff --git a/packages/web3-providers-ipc/test/config/jest.config.js b/packages/web3-providers-ipc/test/config/jest.config.js index 068de35aa8e..5fc38b688f1 100644 --- a/packages/web3-providers-ipc/test/config/jest.config.js +++ b/packages/web3-providers-ipc/test/config/jest.config.js @@ -42,4 +42,5 @@ module.exports = { resetModules: true, resetMocks: true, + testTimeout: 600000, }; diff --git a/packages/web3-types/test/config/jest.config.js b/packages/web3-types/test/config/jest.config.js index 7d959c45719..360e22458fb 100644 --- a/packages/web3-types/test/config/jest.config.js +++ b/packages/web3-types/test/config/jest.config.js @@ -37,4 +37,5 @@ module.exports = { * This can be done programmatically using jest.resetModules(). */ resetModules: true, + testTimeout: 600000, }; diff --git a/packages/web3-utils/test/config/jest.config.js b/packages/web3-utils/test/config/jest.config.js index 74597df99d0..28d62955096 100644 --- a/packages/web3-utils/test/config/jest.config.js +++ b/packages/web3-utils/test/config/jest.config.js @@ -40,4 +40,5 @@ module.exports = { * This can be done programmatically using jest.resetModules(). */ resetModules: true, + testTimeout: 600000, }; diff --git a/packages/web3-validator/test/config/jest.config.js b/packages/web3-validator/test/config/jest.config.js index 74597df99d0..28d62955096 100644 --- a/packages/web3-validator/test/config/jest.config.js +++ b/packages/web3-validator/test/config/jest.config.js @@ -40,4 +40,5 @@ module.exports = { * This can be done programmatically using jest.resetModules(). */ resetModules: true, + testTimeout: 600000, }; diff --git a/packages/web3/test/config/jest.config.js b/packages/web3/test/config/jest.config.js index 74597df99d0..d61c13316fa 100644 --- a/packages/web3/test/config/jest.config.js +++ b/packages/web3/test/config/jest.config.js @@ -40,4 +40,5 @@ module.exports = { * This can be done programmatically using jest.resetModules(). */ resetModules: true, + testTimeout: 600000, }; diff --git a/templates/jest.config.js.tmpl b/templates/jest.config.js.tmpl index e4d70e55a94..d8144cd41e9 100644 --- a/templates/jest.config.js.tmpl +++ b/templates/jest.config.js.tmpl @@ -57,4 +57,5 @@ module.exports = { * This can be done programmatically using jest.resetModules(). */ resetModules: true, + testTimeout: 600000, }; From a1440c1d15bcb075ba1372e29263b5c22733f8e8 Mon Sep 17 00:00:00 2001 From: jdevcs Date: Mon, 26 Aug 2024 13:20:31 +0200 Subject: [PATCH 2/7] fixed lockfile deps --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dd1279159b7..f5fe5d2fdbb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: with: node-version: ${{ matrix.node }} cache: yarn - - run: yarn install --ignore-scripts + - run: yarn install --ignore-scripts --frozen-lockfile - run: npx ts-node scripts/init.ts - run: yarn build:cjs - uses: actions/cache/save@v4 From e2080dc2154858f0cbf6434010bf243aa31b4192 Mon Sep 17 00:00:00 2001 From: jdevcs Date: Mon, 26 Aug 2024 13:29:59 +0200 Subject: [PATCH 3/7] timout in setup.js --- packages/web3-eth-ens/test/integration/setup.js | 3 --- packages/web3-eth/test/e2e/setup.js | 3 --- packages/web3/test/e2e/setup.js | 3 --- packages/web3/test/integration/setup.js | 3 --- packages/web3/test/stress/setup.js | 3 --- 5 files changed, 15 deletions(-) diff --git a/packages/web3-eth-ens/test/integration/setup.js b/packages/web3-eth-ens/test/integration/setup.js index 59b1f904213..c480060944a 100644 --- a/packages/web3-eth-ens/test/integration/setup.js +++ b/packages/web3-eth-ens/test/integration/setup.js @@ -19,6 +19,3 @@ along with web3.js. If not, see . // eslint-disable-next-line @typescript-eslint/no-require-imports require('../config/setup'); -const jestTimeout = 30000; - -jest.setTimeout(jestTimeout); diff --git a/packages/web3-eth/test/e2e/setup.js b/packages/web3-eth/test/e2e/setup.js index fddbec59a1e..c480060944a 100644 --- a/packages/web3-eth/test/e2e/setup.js +++ b/packages/web3-eth/test/e2e/setup.js @@ -19,6 +19,3 @@ along with web3.js. If not, see . // eslint-disable-next-line @typescript-eslint/no-require-imports require('../config/setup'); -const jestTimeout = 30000; // Sometimes `in3` takes long time because of its decentralized nature. - -jest.setTimeout(jestTimeout); diff --git a/packages/web3/test/e2e/setup.js b/packages/web3/test/e2e/setup.js index fddbec59a1e..c480060944a 100644 --- a/packages/web3/test/e2e/setup.js +++ b/packages/web3/test/e2e/setup.js @@ -19,6 +19,3 @@ along with web3.js. If not, see . // eslint-disable-next-line @typescript-eslint/no-require-imports require('../config/setup'); -const jestTimeout = 30000; // Sometimes `in3` takes long time because of its decentralized nature. - -jest.setTimeout(jestTimeout); diff --git a/packages/web3/test/integration/setup.js b/packages/web3/test/integration/setup.js index fddbec59a1e..c480060944a 100644 --- a/packages/web3/test/integration/setup.js +++ b/packages/web3/test/integration/setup.js @@ -19,6 +19,3 @@ along with web3.js. If not, see . // eslint-disable-next-line @typescript-eslint/no-require-imports require('../config/setup'); -const jestTimeout = 30000; // Sometimes `in3` takes long time because of its decentralized nature. - -jest.setTimeout(jestTimeout); diff --git a/packages/web3/test/stress/setup.js b/packages/web3/test/stress/setup.js index e9757a61e1c..c480060944a 100644 --- a/packages/web3/test/stress/setup.js +++ b/packages/web3/test/stress/setup.js @@ -19,6 +19,3 @@ along with web3.js. If not, see . // eslint-disable-next-line @typescript-eslint/no-require-imports require('../config/setup'); -const jestTimeout = 300000; - -jest.setTimeout(jestTimeout); From 61cfc5459f74c7b0a469bc645e342083faf1e3fe Mon Sep 17 00:00:00 2001 From: jdevcs Date: Mon, 26 Aug 2024 14:06:15 +0200 Subject: [PATCH 4/7] continue v18 if err on v20 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f5fe5d2fdbb..d17245b6d9b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -176,6 +176,7 @@ jobs: path: ./ key: web3-${{ matrix.node }}-${{github.sha}} - run: yarn test:unit + continue-on-error: ${{ matrix.node == 20 }} - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 with: From e334df2160df03333a0ca9b6c9fe9f8a31ade308 Mon Sep 17 00:00:00 2001 From: jdevcs Date: Mon, 26 Aug 2024 14:19:20 +0200 Subject: [PATCH 5/7] node 20.17.0 --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d17245b6d9b..b8c0f6647fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: build: strategy: matrix: - node: [18, 20] + node: ['18', '20.17.0'] name: Build CJS runs-on: ubuntu-latest steps: @@ -165,7 +165,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: [18, 20] + node: ['18', '20.17.0'] steps: - uses: actions/setup-node@v4 with: @@ -176,7 +176,7 @@ jobs: path: ./ key: web3-${{ matrix.node }}-${{github.sha}} - run: yarn test:unit - continue-on-error: ${{ matrix.node == 20 }} + continue-on-error: ${{ matrix.node == '20.17.0' }} - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 with: From 8e4fd5345e49094de8f0a5a6356b51f07d28ddf4 Mon Sep 17 00:00:00 2001 From: jdevcs Date: Mon, 26 Aug 2024 14:30:04 +0200 Subject: [PATCH 6/7] update nodev --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b8c0f6647fd..ade1afd52db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: build: strategy: matrix: - node: ['18', '20.17.0'] + node: ['18', '20.x'] name: Build CJS runs-on: ubuntu-latest steps: @@ -165,7 +165,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: ['18', '20.17.0'] + node: ['18', '20.x'] steps: - uses: actions/setup-node@v4 with: @@ -176,7 +176,7 @@ jobs: path: ./ key: web3-${{ matrix.node }}-${{github.sha}} - run: yarn test:unit - continue-on-error: ${{ matrix.node == '20.17.0' }} + continue-on-error: ${{ matrix.node == '20.x' }} - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 with: From 0223165b0a29eb6db1b5390679141811a67ca5ac Mon Sep 17 00:00:00 2001 From: jdevcs Date: Mon, 26 Aug 2024 15:02:29 +0200 Subject: [PATCH 7/7] specific ver --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ade1afd52db..b8c0f6647fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: build: strategy: matrix: - node: ['18', '20.x'] + node: ['18', '20.17.0'] name: Build CJS runs-on: ubuntu-latest steps: @@ -165,7 +165,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: ['18', '20.x'] + node: ['18', '20.17.0'] steps: - uses: actions/setup-node@v4 with: @@ -176,7 +176,7 @@ jobs: path: ./ key: web3-${{ matrix.node }}-${{github.sha}} - run: yarn test:unit - continue-on-error: ${{ matrix.node == '20.x' }} + continue-on-error: ${{ matrix.node == '20.17.0' }} - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 with: