From eded494f5fd20d11029638813dc43eab3ecdc096 Mon Sep 17 00:00:00 2001 From: nedsalk Date: Wed, 8 May 2024 17:39:13 +0200 Subject: [PATCH 1/5] fix: flaky test --- .../src/transaction-response.test.ts | 80 ++++++++++--------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/packages/fuel-gauge/src/transaction-response.test.ts b/packages/fuel-gauge/src/transaction-response.test.ts index c62ba61f51e..6e4b898e1f7 100644 --- a/packages/fuel-gauge/src/transaction-response.test.ts +++ b/packages/fuel-gauge/src/transaction-response.test.ts @@ -247,42 +247,46 @@ describe('TransactionResponse', () => { cleanup(); }); - it('should throw error for a SqueezedOut status update [submitAndAwait]', async () => { - const { cleanup, ip, port } = await launchNode({ - args: ['--poa-instant', 'false', '--poa-interval-period', '1s', '--tx-pool-ttl', '200ms'], - loggingEnabled: false, - }); - const nodeProvider = await Provider.create(`http://${ip}:${port}/v1/graphql`); - - const genesisWallet = new WalletUnlocked( - process.env.GENESIS_SECRET || randomBytes(32), - nodeProvider - ); - - const request = new ScriptTransactionRequest(); - - request.addCoinOutput(Wallet.generate(), 100, baseAssetId); - - const txCost = await genesisWallet.provider.getTransactionCost(request, { - signatureCallback: (tx) => tx.addAccountWitnesses(genesisWallet), - }); - - request.gasLimit = txCost.gasUsed; - request.maxFee = txCost.maxFee; - - await genesisWallet.fund(request, txCost); - - request.updateWitnessByOwner( - genesisWallet.address, - await genesisWallet.signTransaction(request) - ); - - await expectToThrowFuelError( - async () => { - await nodeProvider.sendTransaction(request, { awaitExecution: true }); - }, - { code: ErrorCode.TRANSACTION_SQUEEZED_OUT } - ); - cleanup(); - }); + it( + 'should throw error for a SqueezedOut status update [submitAndAwait]', + async () => { + const { cleanup, ip, port } = await launchNode({ + args: ['--poa-instant', 'false', '--poa-interval-period', '1s', '--tx-pool-ttl', '200ms'], + loggingEnabled: false, + }); + const nodeProvider = await Provider.create(`http://${ip}:${port}/v1/graphql`); + + const genesisWallet = new WalletUnlocked( + process.env.GENESIS_SECRET || randomBytes(32), + nodeProvider + ); + + const request = new ScriptTransactionRequest(); + + request.addCoinOutput(Wallet.generate(), 100, baseAssetId); + + const txCost = await genesisWallet.provider.getTransactionCost(request, { + signatureCallback: (tx) => tx.addAccountWitnesses(genesisWallet), + }); + + request.gasLimit = txCost.gasUsed; + request.maxFee = txCost.maxFee; + + await genesisWallet.fund(request, txCost); + + request.updateWitnessByOwner( + genesisWallet.address, + await genesisWallet.signTransaction(request) + ); + + await expectToThrowFuelError( + async () => { + await nodeProvider.sendTransaction(request, { awaitExecution: true }); + }, + { code: ErrorCode.TRANSACTION_SQUEEZED_OUT } + ); + cleanup(); + }, + { retry: 10 } + ); }); From e6c3b9ba44569deed90f54f303d4c1dbd731dc9c Mon Sep 17 00:00:00 2001 From: nedsalk Date: Wed, 8 May 2024 17:41:03 +0200 Subject: [PATCH 2/5] increase wait time --- packages/fuel-gauge/src/transaction-response.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fuel-gauge/src/transaction-response.test.ts b/packages/fuel-gauge/src/transaction-response.test.ts index 6e4b898e1f7..820f4342556 100644 --- a/packages/fuel-gauge/src/transaction-response.test.ts +++ b/packages/fuel-gauge/src/transaction-response.test.ts @@ -251,7 +251,7 @@ describe('TransactionResponse', () => { 'should throw error for a SqueezedOut status update [submitAndAwait]', async () => { const { cleanup, ip, port } = await launchNode({ - args: ['--poa-instant', 'false', '--poa-interval-period', '1s', '--tx-pool-ttl', '200ms'], + args: ['--poa-instant', 'false', '--poa-interval-period', '2s', '--tx-pool-ttl', '400ms'], loggingEnabled: false, }); const nodeProvider = await Provider.create(`http://${ip}:${port}/v1/graphql`); From 8fb7d19b1a05a8fa18bcdf9b71cfd07ac5f67a8f Mon Sep 17 00:00:00 2001 From: nedsalk Date: Wed, 8 May 2024 17:42:09 +0200 Subject: [PATCH 3/5] increase wait time --- packages/fuel-gauge/src/transaction-response.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fuel-gauge/src/transaction-response.test.ts b/packages/fuel-gauge/src/transaction-response.test.ts index 820f4342556..28dd994747c 100644 --- a/packages/fuel-gauge/src/transaction-response.test.ts +++ b/packages/fuel-gauge/src/transaction-response.test.ts @@ -251,7 +251,7 @@ describe('TransactionResponse', () => { 'should throw error for a SqueezedOut status update [submitAndAwait]', async () => { const { cleanup, ip, port } = await launchNode({ - args: ['--poa-instant', 'false', '--poa-interval-period', '2s', '--tx-pool-ttl', '400ms'], + args: ['--poa-instant', 'false', '--poa-interval-period', '4s', '--tx-pool-ttl', '1s'], loggingEnabled: false, }); const nodeProvider = await Provider.create(`http://${ip}:${port}/v1/graphql`); From 4e0db329c28c245d73fbfb03d6c8a7fa8d39ac49 Mon Sep 17 00:00:00 2001 From: nedsalk Date: Wed, 8 May 2024 17:50:48 +0200 Subject: [PATCH 4/5] remove empty import --- packages/fuel-gauge/src/transaction-response.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/fuel-gauge/src/transaction-response.test.ts b/packages/fuel-gauge/src/transaction-response.test.ts index 28dd994747c..e1d35274321 100644 --- a/packages/fuel-gauge/src/transaction-response.test.ts +++ b/packages/fuel-gauge/src/transaction-response.test.ts @@ -1,4 +1,3 @@ -import type {} from '@fuel-ts/account/dist/providers/__generated__/operations'; import { generateTestWallet, launchNode } from '@fuel-ts/account/test-utils'; import { ErrorCode } from '@fuel-ts/errors'; import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; From 15ddca15473530dcc1b2905ceb6576e4dd5529bf Mon Sep 17 00:00:00 2001 From: nedsalk Date: Wed, 8 May 2024 17:51:13 +0200 Subject: [PATCH 5/5] empty changeset --- .changeset/poor-apes-fly.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changeset/poor-apes-fly.md diff --git a/.changeset/poor-apes-fly.md b/.changeset/poor-apes-fly.md new file mode 100644 index 00000000000..a845151cc84 --- /dev/null +++ b/.changeset/poor-apes-fly.md @@ -0,0 +1,2 @@ +--- +---