From 9c3dc5a170cb3559c1e740f5a16a46b96316eee2 Mon Sep 17 00:00:00 2001 From: Ermal Kaleci Date: Tue, 10 Oct 2023 14:57:02 +0200 Subject: [PATCH 1/4] fix browser undefined --- packages/core/src/blockchain/block-builder.ts | 2 +- packages/core/src/blockchain/txpool.ts | 27 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/packages/core/src/blockchain/block-builder.ts b/packages/core/src/blockchain/block-builder.ts index c47bb90c..7df00b90 100644 --- a/packages/core/src/blockchain/block-builder.ts +++ b/packages/core/src/blockchain/block-builder.ts @@ -298,7 +298,7 @@ export const buildBlock = async ( const storageDiff = await newBlock.storageDiff() - if (logger.isLevelEnabled('trace')) { + if (logger.level === 'trace') { logger.trace( Object.entries(storageDiff).map(([key, value]) => [key, truncate(value)]), 'Final block', diff --git a/packages/core/src/blockchain/txpool.ts b/packages/core/src/blockchain/txpool.ts index 3b30e660..2f75aa1f 100644 --- a/packages/core/src/blockchain/txpool.ts +++ b/packages/core/src/blockchain/txpool.ts @@ -238,20 +238,21 @@ export class TxPool { onApplyExtrinsicError: (extrinsic, error) => { this.event.emit(APPLY_EXTRINSIC_ERROR, [extrinsic, error]) }, - onPhaseApplied: logger.isLevelEnabled('trace') - ? (phase, resp) => { - switch (phase) { - case 'initialize': - logger.trace(truncate(resp.storageDiff), 'Initialize block') - break - case 'finalize': - logger.trace(truncate(resp.storageDiff), 'Finalize block') - break - default: - logger.trace(truncate(resp.storageDiff), `Apply extrinsic ${phase}`) + onPhaseApplied: + logger.level === 'trace' + ? (phase, resp) => { + switch (phase) { + case 'initialize': + logger.trace(truncate(resp.storageDiff), 'Initialize block') + break + case 'finalize': + logger.trace(truncate(resp.storageDiff), 'Finalize block') + break + default: + logger.trace(truncate(resp.storageDiff), `Apply extrinsic ${phase}`) + } } - } - : undefined, + : undefined, }, params.unsafeBlockHeight, ) From ab874bd804c49db25f0504e38737780bddff4720 Mon Sep 17 00:00:00 2001 From: Ermal Kaleci Date: Tue, 10 Oct 2023 15:17:23 +0200 Subject: [PATCH 2/4] fix test --- packages/web-test/tests/index.spec.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/web-test/tests/index.spec.ts b/packages/web-test/tests/index.spec.ts index b2b1cfc3..1439ffc2 100644 --- a/packages/web-test/tests/index.spec.ts +++ b/packages/web-test/tests/index.spec.ts @@ -23,8 +23,10 @@ test.describe('index', () => { test('dry run extrinsics', async ({ page }) => { test.setTimeout(5 * 60 * 1000) - await page.getByText(/dry run call/i).click() + const button = page.getByText(/dry run call/i) + await button.isEnabled({ timeout: 60_000 }) + await button.click() await expect(page.getByText('Loading dry run result...')).toBeVisible() - await expect(page.locator('#extrinsic-section')).toHaveText(/outcome/, { timeout: 200_000 }) + await expect(page.locator('#extrinsic-section')).toHaveText(/outcome/, { timeout: 60_000 }) }) }) From cf247d8b5dce638a4cd31b6fe3dff13c63362ed3 Mon Sep 17 00:00:00 2001 From: Ermal Kaleci Date: Tue, 10 Oct 2023 15:49:00 +0200 Subject: [PATCH 3/4] fix test --- packages/web-test/tests/index.spec.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/web-test/tests/index.spec.ts b/packages/web-test/tests/index.spec.ts index 1439ffc2..d50b7e35 100644 --- a/packages/web-test/tests/index.spec.ts +++ b/packages/web-test/tests/index.spec.ts @@ -19,14 +19,9 @@ test.describe('index', () => { await expect(page.locator('#blocks-section')).toHaveText(/4000000/, { timeout: 60_000 }) // wait for new block await expect(page.locator('#blocks-section')).toHaveText(/4000001/, { timeout: 200_000 }) - }) - test('dry run extrinsics', async ({ page }) => { - test.setTimeout(5 * 60 * 1000) - const button = page.getByText(/dry run call/i) - await button.isEnabled({ timeout: 60_000 }) - await button.click() + await page.getByText(/dry run call/i).click() await expect(page.getByText('Loading dry run result...')).toBeVisible() - await expect(page.locator('#extrinsic-section')).toHaveText(/outcome/, { timeout: 60_000 }) + await expect(page.locator('#extrinsic-section')).toHaveText(/outcome/, { timeout: 200_000 }) }) }) From ec6f338137a51f3cfb8ecd989328c6f9af47add7 Mon Sep 17 00:00:00 2001 From: Ermal Kaleci Date: Tue, 10 Oct 2023 15:52:50 +0200 Subject: [PATCH 4/4] fix --- packages/core/src/blockchain/block-builder.ts | 2 +- packages/core/src/blockchain/txpool.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/src/blockchain/block-builder.ts b/packages/core/src/blockchain/block-builder.ts index 7df00b90..ad3f982d 100644 --- a/packages/core/src/blockchain/block-builder.ts +++ b/packages/core/src/blockchain/block-builder.ts @@ -298,7 +298,7 @@ export const buildBlock = async ( const storageDiff = await newBlock.storageDiff() - if (logger.level === 'trace') { + if (logger.level.toLowerCase() === 'trace') { logger.trace( Object.entries(storageDiff).map(([key, value]) => [key, truncate(value)]), 'Final block', diff --git a/packages/core/src/blockchain/txpool.ts b/packages/core/src/blockchain/txpool.ts index 2f75aa1f..97d20738 100644 --- a/packages/core/src/blockchain/txpool.ts +++ b/packages/core/src/blockchain/txpool.ts @@ -239,7 +239,7 @@ export class TxPool { this.event.emit(APPLY_EXTRINSIC_ERROR, [extrinsic, error]) }, onPhaseApplied: - logger.level === 'trace' + logger.level.toLowerCase() === 'trace' ? (phase, resp) => { switch (phase) { case 'initialize':