diff --git a/.changeset/four-flowers-yawn.md b/.changeset/four-flowers-yawn.md new file mode 100644 index 0000000000..7f1f83c2c5 --- /dev/null +++ b/.changeset/four-flowers-yawn.md @@ -0,0 +1,5 @@ +--- +"fuels": patch +--- + +chore: export test and cli utilities in `fuels` umbrella package diff --git a/apps/demo-bun-fuels/src/bun.test.ts b/apps/demo-bun-fuels/src/bun.test.ts index 14062adb14..61be13cd84 100644 --- a/apps/demo-bun-fuels/src/bun.test.ts +++ b/apps/demo-bun-fuels/src/bun.test.ts @@ -5,9 +5,8 @@ * It ensures that built code is fully working. */ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import { safeExec } from '@fuel-ts/errors/test-utils'; import { ContractFactory, Provider, toHex, Wallet, FUEL_NETWORK_URL } from 'fuels'; +import { generateTestWallet , safeExec } from 'fuels/test-utils'; import { SampleAbi__factory } from './sway-programs-api'; import bytecode from './sway-programs-api/contracts/SampleAbi.hex'; diff --git a/apps/demo-fuels/src/index.test.ts b/apps/demo-fuels/src/index.test.ts index c912d3533f..0cfc7ff93c 100644 --- a/apps/demo-fuels/src/index.test.ts +++ b/apps/demo-fuels/src/index.test.ts @@ -5,9 +5,8 @@ * It ensures that built code is fully working. */ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import { safeExec } from '@fuel-ts/errors/test-utils'; import { ContractFactory, Provider, toHex, Wallet, FUEL_NETWORK_URL } from 'fuels'; +import { generateTestWallet , safeExec } from 'fuels/test-utils'; import { SampleAbi__factory } from './sway-programs-api'; import bytecode from './sway-programs-api/contracts/SampleAbi.hex'; diff --git a/apps/demo-typegen/src/demo.test.ts b/apps/demo-typegen/src/demo.test.ts index 70c927e98e..26f55d2bb7 100644 --- a/apps/demo-typegen/src/demo.test.ts +++ b/apps/demo-typegen/src/demo.test.ts @@ -1,7 +1,6 @@ // #region Testing-in-ts-ts -import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import { safeExec } from '@fuel-ts/errors/test-utils'; import { ContractFactory, Provider, toHex, Wallet, FUEL_NETWORK_URL, Address } from 'fuels'; +import { generateTestWallet , safeExec } from 'fuels/test-utils'; import storageSlots from '../contract/out/release/demo-contract-storage_slots.json'; diff --git a/apps/docs-snippets/src/guide/contracts/add-transfer.test.ts b/apps/docs-snippets/src/guide/contracts/add-transfer.test.ts index 4959bf18da..ba453a6ad2 100644 --- a/apps/docs-snippets/src/guide/contracts/add-transfer.test.ts +++ b/apps/docs-snippets/src/guide/contracts/add-transfer.test.ts @@ -1,6 +1,6 @@ -import { ASSET_A, ASSET_B } from '@fuel-ts/utils/test-utils'; import type { Account, Contract, Provider, TransferParams } from 'fuels'; import { Wallet } from 'fuels'; +import { ASSET_A, ASSET_B } from 'fuels/test-utils'; import { DocSnippetProjectsEnum } from '../../../test/fixtures/forc-projects'; import { createAndDeployContractFromProject, getTestWallet } from '../../utils'; diff --git a/apps/docs-snippets/src/guide/encoding/encode-and-decode.test.ts b/apps/docs-snippets/src/guide/encoding/encode-and-decode.test.ts index b1ec65fc2a..7e549172bd 100644 --- a/apps/docs-snippets/src/guide/encoding/encode-and-decode.test.ts +++ b/apps/docs-snippets/src/guide/encoding/encode-and-decode.test.ts @@ -1,4 +1,3 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { FUEL_NETWORK_URL, Provider, @@ -9,6 +8,7 @@ import { arrayify, } from 'fuels'; import type { Account, JsonAbi, JsonAbiArgument, TransactionResultReturnDataReceipt } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import abiSnippet from '../../../test/fixtures/abi/encode-and-decode.jsonc'; import { SumScriptAbi__factory as factory } from '../../../test/typegen/scripts/factories/SumScriptAbi__factory'; diff --git a/apps/docs-snippets/src/guide/predicates/interacting-with-predicates.test.ts b/apps/docs-snippets/src/guide/predicates/interacting-with-predicates.test.ts index f65d10f3d7..8a6c8ac587 100644 --- a/apps/docs-snippets/src/guide/predicates/interacting-with-predicates.test.ts +++ b/apps/docs-snippets/src/guide/predicates/interacting-with-predicates.test.ts @@ -1,6 +1,6 @@ -import { seedTestWallet } from '@fuel-ts/account/test-utils'; import type { Provider, WalletUnlocked } from 'fuels'; import { ScriptTransactionRequest, bn, Predicate, BN } from 'fuels'; +import { seedTestWallet } from 'fuels/test-utils'; import { DocSnippetProjectsEnum, diff --git a/apps/docs-snippets/src/guide/predicates/send-and-spend-funds-from-predicates.test.ts b/apps/docs-snippets/src/guide/predicates/send-and-spend-funds-from-predicates.test.ts index a3b618319f..0e67075a22 100644 --- a/apps/docs-snippets/src/guide/predicates/send-and-spend-funds-from-predicates.test.ts +++ b/apps/docs-snippets/src/guide/predicates/send-and-spend-funds-from-predicates.test.ts @@ -1,7 +1,6 @@ -import { seedTestWallet } from '@fuel-ts/account/test-utils'; -import { safeExec } from '@fuel-ts/errors/test-utils'; import type { Provider } from 'fuels'; import { WalletUnlocked, Predicate, getRandomB256 } from 'fuels'; +import { seedTestWallet, safeExec } from 'fuels/test-utils'; import { DocSnippetProjectsEnum, diff --git a/apps/docs-snippets/src/guide/provider/querying-the-chain.test.ts b/apps/docs-snippets/src/guide/provider/querying-the-chain.test.ts index 14839c794a..a8e09b2f2b 100644 --- a/apps/docs-snippets/src/guide/provider/querying-the-chain.test.ts +++ b/apps/docs-snippets/src/guide/provider/querying-the-chain.test.ts @@ -1,5 +1,5 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { FUEL_NETWORK_URL, Provider, ScriptTransactionRequest, bn } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; /** * @group node diff --git a/apps/docs-snippets/src/guide/scripts/script-custom-transaction.test.ts b/apps/docs-snippets/src/guide/scripts/script-custom-transaction.test.ts index f6cf327beb..5240fa8613 100644 --- a/apps/docs-snippets/src/guide/scripts/script-custom-transaction.test.ts +++ b/apps/docs-snippets/src/guide/scripts/script-custom-transaction.test.ts @@ -1,4 +1,3 @@ -import { ASSET_A, ASSET_B } from '@fuel-ts/utils/test-utils'; import { BN, ContractFactory, @@ -8,6 +7,7 @@ import { Provider, } from 'fuels'; import type { CoinQuantityLike, Contract, WalletUnlocked } from 'fuels'; +import { ASSET_A, ASSET_B } from 'fuels/test-utils'; import { DocSnippetProjectsEnum, diff --git a/apps/docs-snippets/src/guide/transactions/transaction-request.test.ts b/apps/docs-snippets/src/guide/transactions/transaction-request.test.ts index d77010537f..0956d87f02 100644 --- a/apps/docs-snippets/src/guide/transactions/transaction-request.test.ts +++ b/apps/docs-snippets/src/guide/transactions/transaction-request.test.ts @@ -1,4 +1,3 @@ -import { seedTestWallet } from '@fuel-ts/account/test-utils'; import type { Account, Coin, Resource } from 'fuels'; import { CreateTransactionRequest, @@ -12,6 +11,7 @@ import { FUEL_NETWORK_URL, WalletUnlocked, } from 'fuels'; +import { seedTestWallet } from 'fuels/test-utils'; import { DocSnippetProjectsEnum, diff --git a/apps/docs-snippets/src/guide/types/enums.test.ts b/apps/docs-snippets/src/guide/types/enums.test.ts index a8c2598dec..d6ba84a53c 100644 --- a/apps/docs-snippets/src/guide/types/enums.test.ts +++ b/apps/docs-snippets/src/guide/types/enums.test.ts @@ -1,5 +1,5 @@ -import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; import { FuelError, type Contract } from 'fuels'; +import { expectToThrowFuelError } from 'fuels/test-utils'; import { DocSnippetProjectsEnum } from '../../../test/fixtures/forc-projects'; import { createAndDeployContractFromProject } from '../../utils'; diff --git a/apps/docs-snippets/src/guide/wallets/checking-balances.test.ts b/apps/docs-snippets/src/guide/wallets/checking-balances.test.ts index c345d47984..d6d1890f19 100644 --- a/apps/docs-snippets/src/guide/wallets/checking-balances.test.ts +++ b/apps/docs-snippets/src/guide/wallets/checking-balances.test.ts @@ -1,7 +1,6 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import { ASSET_A } from '@fuel-ts/utils/test-utils'; import type { CoinQuantity, BN } from 'fuels'; import { FUEL_NETWORK_URL, Provider, Wallet } from 'fuels'; +import { generateTestWallet, ASSET_A } from 'fuels/test-utils'; /** * @group node diff --git a/apps/docs-snippets/src/guide/wallets/signing.test.ts b/apps/docs-snippets/src/guide/wallets/signing.test.ts index 41837094ea..891e0a6470 100644 --- a/apps/docs-snippets/src/guide/wallets/signing.test.ts +++ b/apps/docs-snippets/src/guide/wallets/signing.test.ts @@ -1,4 +1,3 @@ -import { seedTestWallet } from '@fuel-ts/account/test-utils'; import { Address, FUEL_NETWORK_URL, @@ -8,6 +7,7 @@ import { WalletUnlocked, hashMessage, } from 'fuels'; +import { seedTestWallet } from 'fuels/test-utils'; /** * @group node diff --git a/apps/docs-snippets/src/guide/wallets/test-wallets.test.ts b/apps/docs-snippets/src/guide/wallets/test-wallets.test.ts index 7a7e99cc8b..ee0b7c042e 100644 --- a/apps/docs-snippets/src/guide/wallets/test-wallets.test.ts +++ b/apps/docs-snippets/src/guide/wallets/test-wallets.test.ts @@ -1,6 +1,6 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { CoinQuantity, WalletUnlocked } from 'fuels'; import { FUEL_NETWORK_URL, Provider, bn } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; /** * @group node @@ -9,7 +9,7 @@ describe(__filename, () => { it('wallet-setup', async () => { // #region wallet-setup // #import { FUEL_NETWORK_URL, Provider, WalletUnlocked, CoinQuantity, generateTestWallet }; - // #context import { generateTestWallet } from '@fuel-ts/wallet/test-utils'; + // #context import { generateTestWallet } from 'fuels/test-utils'; const provider = await Provider.create(FUEL_NETWORK_URL); const baseAssetId = provider.getBaseAssetId(); diff --git a/apps/docs-snippets/src/guide/wallets/wallet-transferring.test.ts b/apps/docs-snippets/src/guide/wallets/wallet-transferring.test.ts index 2c75bc97ff..600dd371ff 100644 --- a/apps/docs-snippets/src/guide/wallets/wallet-transferring.test.ts +++ b/apps/docs-snippets/src/guide/wallets/wallet-transferring.test.ts @@ -1,7 +1,6 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import { ASSET_A } from '@fuel-ts/utils/test-utils'; import type { Contract, TransferParams } from 'fuels'; import { FUEL_NETWORK_URL, Provider, Wallet } from 'fuels'; +import { generateTestWallet, ASSET_A } from 'fuels/test-utils'; import { DocSnippetProjectsEnum } from '../../../test/fixtures/forc-projects'; import { createAndDeployContractFromProject } from '../../utils'; diff --git a/apps/docs-snippets/test/fixtures/forc-projects/index.ts b/apps/docs-snippets/test/fixtures/forc-projects/index.ts index 1db65624c5..b1cf48896e 100644 --- a/apps/docs-snippets/test/fixtures/forc-projects/index.ts +++ b/apps/docs-snippets/test/fixtures/forc-projects/index.ts @@ -1,5 +1,5 @@ -import { getForcProject } from '@fuel-ts/utils/test-utils'; import type { JsonAbi } from 'fuels'; +import { getForcProject } from 'fuels/test-utils'; import { join } from 'path'; export enum DocSnippetProjectsEnum { diff --git a/apps/docs/.vitepress/plugins/utils/extractImports.test.ts b/apps/docs/.vitepress/plugins/utils/extractImports.test.ts index 6a2fbc5eba..5bfc8a7799 100644 --- a/apps/docs/.vitepress/plugins/utils/extractImports.test.ts +++ b/apps/docs/.vitepress/plugins/utils/extractImports.test.ts @@ -1,10 +1,15 @@ import { ErrorCode, FuelError } from '@fuel-ts/errors'; import * as extractImportsMod from './extractImports'; import fs from 'fs'; -import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; +import { expectToThrowFuelError } from 'fuels/test-utils'; -const { collectImportStatements, combineImportStatements, validateImports, extractImports, validateSnippetContent } = - extractImportsMod; +const { + collectImportStatements, + combineImportStatements, + validateImports, + extractImports, + validateSnippetContent, +} = extractImportsMod; /** * @group node @@ -46,11 +51,11 @@ describe('extractImports', () => { const importStatements = { somewhere: new Set(['implementationImport']), 'type::somewhere': new Set(['typeImport']), - } + }; - const actual = combineImportStatements(importStatements) + const actual = combineImportStatements(importStatements); expect(actual).toBe(expected); - }) + }); }); describe('validateImports', () => { @@ -108,24 +113,21 @@ describe('extractImports', () => { ]; const filepath = '/some/file/asset-id.test.ts'; expect(() => validateSnippetContent(codeSnippet, filepath)).not.toThrow(); - }) + }); it('should throw an error when malformed #imports detected', async () => { - const codeSnippet = [ - '// #import { AssetId }', - ] + const codeSnippet = ['// #import { AssetId }']; const filepath = '/some/file/asset-id.test.ts'; - + await expectToThrowFuelError( () => validateSnippetContent(codeSnippet, filepath), new FuelError( ErrorCode.VITEPRESS_PLUGIN_ERROR, `Found malformed "#import" statements in code snippet.\nCorrect format: "// #import { ExampleImport };"\n\nPlease check "${filepath}".\n\n// #import { AssetId }` ) - ) + ); }); - - }) + }); describe('collectImportStatements', () => { it('should handle empty lines', () => { @@ -216,7 +218,9 @@ describe('extractImports', () => { expect(readFileSync).toBeCalledTimes(1); - expect(result).toEqual("import { Address } from 'fuels';\nimport type { AssetId } from 'fuels';"); + expect(result).toEqual( + "import { Address } from 'fuels';\nimport type { AssetId } from 'fuels';" + ); }); }); }); diff --git a/internal/check-imports/src/references.ts b/internal/check-imports/src/references.ts index c95fa1a451..ef227a58fe 100644 --- a/internal/check-imports/src/references.ts +++ b/internal/check-imports/src/references.ts @@ -14,7 +14,6 @@ import { Provider, } from '@fuel-ts/account'; import { FUEL_NETWORK_URL } from '@fuel-ts/account/configs'; -import { generateTestWallet, seedTestWallet } from '@fuel-ts/account/test-utils'; import { Address } from '@fuel-ts/address'; import { ContractFactory } from '@fuel-ts/contract'; import { encrypt, decrypt } from '@fuel-ts/crypto'; @@ -40,6 +39,7 @@ import { hexlify, createConfig, } from 'fuels'; +import { generateTestWallet, seedTestWallet } from 'fuels/test-utils'; const { log } = console; diff --git a/packages/fuel-gauge/src/advanced-logging.test.ts b/packages/fuel-gauge/src/advanced-logging.test.ts index cab2a8490a..5ddc90954a 100644 --- a/packages/fuel-gauge/src/advanced-logging.test.ts +++ b/packages/fuel-gauge/src/advanced-logging.test.ts @@ -1,7 +1,7 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { FuelError } from '@fuel-ts/errors'; import type { Contract, Provider, WalletUnlocked } from 'fuels'; import { Script, bn } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/auth-testing.test.ts b/packages/fuel-gauge/src/auth-testing.test.ts index 18e58b5d8b..0a15ee550f 100644 --- a/packages/fuel-gauge/src/auth-testing.test.ts +++ b/packages/fuel-gauge/src/auth-testing.test.ts @@ -1,6 +1,6 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { Contract, WalletUnlocked } from 'fuels'; import { ContractFactory, Provider, getRandomB256, FUEL_NETWORK_URL } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/await-execution.test.ts b/packages/fuel-gauge/src/await-execution.test.ts index 9d205372a4..2e300e600f 100644 --- a/packages/fuel-gauge/src/await-execution.test.ts +++ b/packages/fuel-gauge/src/await-execution.test.ts @@ -1,5 +1,5 @@ -import { launchNode } from '@fuel-ts/account/test-utils'; import { Provider, WalletUnlocked, randomBytes, Wallet, FUEL_NETWORK_URL } from 'fuels'; +import { launchNode } from 'fuels/test-utils'; /** * @group node diff --git a/packages/fuel-gauge/src/bytes.test.ts b/packages/fuel-gauge/src/bytes.test.ts index d85209ca6a..bd6098402c 100644 --- a/packages/fuel-gauge/src/bytes.test.ts +++ b/packages/fuel-gauge/src/bytes.test.ts @@ -1,6 +1,6 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { bn, Predicate, Wallet, Address, Provider, FUEL_NETWORK_URL } from 'fuels'; import type { BN, Contract } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/call-test-contract.test.ts b/packages/fuel-gauge/src/call-test-contract.test.ts index e47cdfe054..b590df8e97 100644 --- a/packages/fuel-gauge/src/call-test-contract.test.ts +++ b/packages/fuel-gauge/src/call-test-contract.test.ts @@ -1,7 +1,6 @@ -import { ASSET_A } from '@fuel-ts/utils/test-utils'; import type { Contract } from 'fuels'; import { BN, bn, toHex } from 'fuels'; -import { launchTestNode } from 'fuels/test-utils'; +import { ASSET_A, launchTestNode } from 'fuels/test-utils'; import { CallTestContractAbi__factory } from '../test/typegen/contracts'; import bytecode from '../test/typegen/contracts/CallTestContractAbi.hex'; diff --git a/packages/fuel-gauge/src/configurable-contract.test.ts b/packages/fuel-gauge/src/configurable-contract.test.ts index 793cd76472..d421bab924 100644 --- a/packages/fuel-gauge/src/configurable-contract.test.ts +++ b/packages/fuel-gauge/src/configurable-contract.test.ts @@ -1,6 +1,6 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { CoinQuantityLike, WalletUnlocked } from 'fuels'; import { BN, ContractFactory, Provider, getRandomB256, FUEL_NETWORK_URL } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/contract-factory.test.ts b/packages/fuel-gauge/src/contract-factory.test.ts index 649c69a3d7..f5facc3860 100644 --- a/packages/fuel-gauge/src/contract-factory.test.ts +++ b/packages/fuel-gauge/src/contract-factory.test.ts @@ -1,8 +1,7 @@ import type { Account, TransactionResult } from '@fuel-ts/account'; -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { FuelError, ErrorCode } from '@fuel-ts/errors'; -import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; import { BN, bn, toHex, Interface, Provider, ContractFactory, FUEL_NETWORK_URL } from 'fuels'; +import { generateTestWallet, expectToThrowFuelError } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index d4dfc09da7..ad2dcd4ecc 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -1,7 +1,4 @@ -import { generateTestWallet, seedTestWallet } from '@fuel-ts/account/test-utils'; import { ErrorCode, FuelError } from '@fuel-ts/errors'; -import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; -import { ASSET_A, ASSET_B } from '@fuel-ts/utils/test-utils'; import type { TransactionRequestLike, TransactionResponse, @@ -28,6 +25,13 @@ import { Predicate, PolicyType, } from 'fuels'; +import { + generateTestWallet, + seedTestWallet, + expectToThrowFuelError, + ASSET_A, + ASSET_B, +} from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/doc-examples.test.ts b/packages/fuel-gauge/src/doc-examples.test.ts index daf96673de..38ccb269dd 100644 --- a/packages/fuel-gauge/src/doc-examples.test.ts +++ b/packages/fuel-gauge/src/doc-examples.test.ts @@ -1,4 +1,3 @@ -import { generateTestWallet, seedTestWallet } from '@fuel-ts/account/test-utils'; import type { Bech32Address, BigNumberish, @@ -26,6 +25,7 @@ import { FUEL_NETWORK_URL, TESTNET_NETWORK_URL, } from 'fuels'; +import { generateTestWallet, seedTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/dry-run-multiple-txs.test.ts b/packages/fuel-gauge/src/dry-run-multiple-txs.test.ts index 4a691576bf..0376c567e4 100644 --- a/packages/fuel-gauge/src/dry-run-multiple-txs.test.ts +++ b/packages/fuel-gauge/src/dry-run-multiple-txs.test.ts @@ -1,4 +1,3 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { CallResult, DryRunStatus, @@ -7,6 +6,7 @@ import type { WalletUnlocked, } from 'fuels'; import { ContractFactory, FUEL_NETWORK_URL, Provider, Wallet } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/edge-cases.test.ts b/packages/fuel-gauge/src/edge-cases.test.ts index 4cef5f024d..ec697345c5 100644 --- a/packages/fuel-gauge/src/edge-cases.test.ts +++ b/packages/fuel-gauge/src/edge-cases.test.ts @@ -1,5 +1,5 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { FUEL_NETWORK_URL, Provider, TransactionResponse, Wallet } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { getSetupContract } from './utils'; diff --git a/packages/fuel-gauge/src/fee.test.ts b/packages/fuel-gauge/src/fee.test.ts index dcd3ece6a4..4b61b265ad 100644 --- a/packages/fuel-gauge/src/fee.test.ts +++ b/packages/fuel-gauge/src/fee.test.ts @@ -1,5 +1,3 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import { ASSET_A, ASSET_B, expectToBeInRange } from '@fuel-ts/utils/test-utils'; import type { BN, BaseWalletUnlocked } from 'fuels'; import { ContractFactory, @@ -10,6 +8,7 @@ import { Wallet, getRandomB256, } from 'fuels'; +import { generateTestWallet, ASSET_A, ASSET_B, expectToBeInRange } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/funding-transaction.test.ts b/packages/fuel-gauge/src/funding-transaction.test.ts index d702b750df..9aaf2232dc 100644 --- a/packages/fuel-gauge/src/funding-transaction.test.ts +++ b/packages/fuel-gauge/src/funding-transaction.test.ts @@ -1,8 +1,7 @@ -import { seedTestWallet } from '@fuel-ts/account/test-utils'; import { FuelError } from '@fuel-ts/errors'; -import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; import type { Account, CoinTransactionRequestInput } from 'fuels'; import { FUEL_NETWORK_URL, Provider, ScriptTransactionRequest, Wallet, bn } from 'fuels'; +import { expectToThrowFuelError, seedTestWallet } from 'fuels/test-utils'; /** * @group node diff --git a/packages/fuel-gauge/src/min-gas.test.ts b/packages/fuel-gauge/src/min-gas.test.ts index 3896123799..db9cabb89c 100644 --- a/packages/fuel-gauge/src/min-gas.test.ts +++ b/packages/fuel-gauge/src/min-gas.test.ts @@ -1,4 +1,3 @@ -import { seedTestWallet } from '@fuel-ts/account/test-utils'; import { ContractFactory, Wallet, @@ -13,6 +12,7 @@ import { getGasUsedFromReceipts, BigNumberCoder, } from 'fuels'; +import { seedTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/options.test.ts b/packages/fuel-gauge/src/options.test.ts index 548e3214db..1253f320f7 100644 --- a/packages/fuel-gauge/src/options.test.ts +++ b/packages/fuel-gauge/src/options.test.ts @@ -1,5 +1,5 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { Contract, WalletUnlocked } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { getSetupContract } from './utils'; diff --git a/packages/fuel-gauge/src/policies.test.ts b/packages/fuel-gauge/src/policies.test.ts index 1bdf44bec1..fc0fcd2b15 100644 --- a/packages/fuel-gauge/src/policies.test.ts +++ b/packages/fuel-gauge/src/policies.test.ts @@ -1,4 +1,3 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { BaseTransactionRequest, BigNumberish, Transaction, WalletUnlocked } from 'fuels'; import { ContractFactory, @@ -11,6 +10,7 @@ import { Wallet, bn, } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { getFuelGaugeForcProject, FuelGaugeProjectsEnum } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts index 0ea0510b70..92925485f6 100644 --- a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts +++ b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts @@ -1,6 +1,5 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import { ASSET_A, ASSET_B } from '@fuel-ts/utils/test-utils'; import { Provider, FUEL_NETWORK_URL, Predicate, Wallet, ScriptTransactionRequest, bn } from 'fuels'; +import { generateTestWallet, ASSET_A, ASSET_B } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts b/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts index e56df365c6..6e0acaabf8 100644 --- a/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts @@ -1,6 +1,6 @@ -import { seedTestWallet } from '@fuel-ts/account/test-utils'; import type { WalletLocked, WalletUnlocked, BigNumberish } from 'fuels'; import { Provider, FUEL_NETWORK_URL, toHex, Predicate } from 'fuels'; +import { seedTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../../test/fixtures'; import type { Validation } from '../types/predicate'; diff --git a/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts b/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts index 9b20a5fb78..ab4c02f3f9 100644 --- a/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts @@ -1,6 +1,6 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { CoinQuantityLike } from 'fuels'; import { getRandomB256, Provider, WalletUnlocked, Predicate, FUEL_NETWORK_URL } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../../test/fixtures'; diff --git a/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts b/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts index a98dbad006..a24d30062a 100644 --- a/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts @@ -1,4 +1,3 @@ -import { seedTestWallet } from '@fuel-ts/account/test-utils'; import type { CoinTransactionRequestInput, MessageTransactionRequestInput, @@ -16,6 +15,7 @@ import { WalletUnlocked, isRequestInputResource, } from 'fuels'; +import { seedTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../../test/fixtures'; import type { Validation } from '../types/predicate'; diff --git a/packages/fuel-gauge/src/predicate/predicate-general.test.ts b/packages/fuel-gauge/src/predicate/predicate-general.test.ts index 7eedb6452f..9a9a08cf99 100644 --- a/packages/fuel-gauge/src/predicate/predicate-general.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-general.test.ts @@ -1,4 +1,3 @@ -import { ASSET_A, ASSET_B } from '@fuel-ts/utils/test-utils'; import type { BN, FakeResources } from 'fuels'; import { Address, @@ -8,6 +7,7 @@ import { ScriptTransactionRequest, bn, } from 'fuels'; +import { ASSET_A, ASSET_B } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../../test/fixtures'; diff --git a/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts b/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts index 134f485199..65d4802035 100644 --- a/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts @@ -1,4 +1,3 @@ -import { seedTestWallet } from '@fuel-ts/account/test-utils'; import type { CoinQuantityLike, ExcludeResourcesOption, Resource, WalletUnlocked } from 'fuels'; import { Provider, @@ -9,6 +8,7 @@ import { bn, isCoin, } from 'fuels'; +import { seedTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../../test/fixtures'; diff --git a/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts b/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts index 2038a63bc7..f980e8d883 100644 --- a/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts @@ -1,6 +1,6 @@ -import { generateTestWallet, seedTestWallet } from '@fuel-ts/account/test-utils'; import type { BigNumberish, WalletUnlocked } from 'fuels'; import { toNumber, Script, Provider, Predicate, FUEL_NETWORK_URL } from 'fuels'; +import { generateTestWallet, seedTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../../test/fixtures'; import type { Validation } from '../types/predicate'; diff --git a/packages/fuel-gauge/src/predicate/utils/predicate/setupContract.ts b/packages/fuel-gauge/src/predicate/utils/predicate/setupContract.ts index bf768aa491..f7d4e13de4 100644 --- a/packages/fuel-gauge/src/predicate/utils/predicate/setupContract.ts +++ b/packages/fuel-gauge/src/predicate/utils/predicate/setupContract.ts @@ -1,7 +1,6 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import { ASSET_A } from '@fuel-ts/utils/test-utils'; import { ContractFactory, FUEL_NETWORK_URL, Provider } from 'fuels'; import type { Interface, JsonAbi, Contract, WalletUnlocked, BytesLike } from 'fuels'; +import { generateTestWallet, ASSET_A } from 'fuels/test-utils'; let walletInstance: WalletUnlocked; let contractInstance: Contract; diff --git a/packages/fuel-gauge/src/predicate/utils/predicate/setupWallets.ts b/packages/fuel-gauge/src/predicate/utils/predicate/setupWallets.ts index 79961b7c77..2222df9502 100644 --- a/packages/fuel-gauge/src/predicate/utils/predicate/setupWallets.ts +++ b/packages/fuel-gauge/src/predicate/utils/predicate/setupWallets.ts @@ -1,6 +1,6 @@ import { Wallet } from '@fuel-ts/account'; -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { Address, FUEL_NETWORK_URL, Provider } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; export const setupWallets = async () => { const provider = await Provider.create(FUEL_NETWORK_URL); diff --git a/packages/fuel-gauge/src/raw-slice.test.ts b/packages/fuel-gauge/src/raw-slice.test.ts index 90ef2c7d2c..375bd522c7 100644 --- a/packages/fuel-gauge/src/raw-slice.test.ts +++ b/packages/fuel-gauge/src/raw-slice.test.ts @@ -1,6 +1,6 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { bn, Predicate, Wallet, Address, Provider, FUEL_NETWORK_URL } from 'fuels'; import type { BN, Contract } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/reentrant-contract-calls.test.ts b/packages/fuel-gauge/src/reentrant-contract-calls.test.ts index 9665fd8df1..36cfb84d0a 100644 --- a/packages/fuel-gauge/src/reentrant-contract-calls.test.ts +++ b/packages/fuel-gauge/src/reentrant-contract-calls.test.ts @@ -1,6 +1,6 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { Contract, WalletUnlocked } from 'fuels'; import { ContractFactory, FUEL_NETWORK_URL, Provider, ReceiptType, bn } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/revert-error.test.ts b/packages/fuel-gauge/src/revert-error.test.ts index 5ccb40615b..a6d50f60d9 100644 --- a/packages/fuel-gauge/src/revert-error.test.ts +++ b/packages/fuel-gauge/src/revert-error.test.ts @@ -1,8 +1,7 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { ErrorCode, FuelError } from '@fuel-ts/errors'; -import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; import type { Contract, WalletUnlocked, TransactionResultReceipt } from 'fuels'; import { bn, ContractFactory, Provider, FUEL_NETWORK_URL, getRandomB256 } from 'fuels'; +import { expectToThrowFuelError, generateTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/script-main-args.test.ts b/packages/fuel-gauge/src/script-main-args.test.ts index cf464c48b4..ed35e4e10c 100644 --- a/packages/fuel-gauge/src/script-main-args.test.ts +++ b/packages/fuel-gauge/src/script-main-args.test.ts @@ -1,6 +1,6 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { BigNumberish } from 'fuels'; import { Provider, bn, Script, FUEL_NETWORK_URL } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/script-with-configurable.test.ts b/packages/fuel-gauge/src/script-with-configurable.test.ts index d632cc235d..0984199e35 100644 --- a/packages/fuel-gauge/src/script-with-configurable.test.ts +++ b/packages/fuel-gauge/src/script-with-configurable.test.ts @@ -1,6 +1,6 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { CoinQuantityLike, WalletUnlocked } from 'fuels'; import { Script, Provider, FUEL_NETWORK_URL } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/script-with-vectors.test.ts b/packages/fuel-gauge/src/script-with-vectors.test.ts index 65ef082647..a31dfece17 100644 --- a/packages/fuel-gauge/src/script-with-vectors.test.ts +++ b/packages/fuel-gauge/src/script-with-vectors.test.ts @@ -1,6 +1,6 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { BigNumberish } from 'fuels'; import { FUEL_NETWORK_URL, Provider } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { getScript } from './utils'; diff --git a/packages/fuel-gauge/src/std-lib-string.test.ts b/packages/fuel-gauge/src/std-lib-string.test.ts index 3a55a923ef..2661fdbc73 100644 --- a/packages/fuel-gauge/src/std-lib-string.test.ts +++ b/packages/fuel-gauge/src/std-lib-string.test.ts @@ -1,6 +1,6 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { bn, Predicate, Wallet, Address, Provider, FUEL_NETWORK_URL } from 'fuels'; import type { Contract } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/storage-test-contract.test.ts b/packages/fuel-gauge/src/storage-test-contract.test.ts index 47b5d9053f..09fec504d3 100644 --- a/packages/fuel-gauge/src/storage-test-contract.test.ts +++ b/packages/fuel-gauge/src/storage-test-contract.test.ts @@ -1,5 +1,5 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { toHex, Provider, ContractFactory, FUEL_NETWORK_URL } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/token-test-contract.test.ts b/packages/fuel-gauge/src/token-test-contract.test.ts index 532025c492..49b204cd93 100644 --- a/packages/fuel-gauge/src/token-test-contract.test.ts +++ b/packages/fuel-gauge/src/token-test-contract.test.ts @@ -1,8 +1,7 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import { ErrorCode, FuelError } from '@fuel-ts/errors'; -import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; import type { AssetId, BN } from 'fuels'; import { toHex, Provider, Wallet, ContractFactory, bn, FUEL_NETWORK_URL } from 'fuels'; +import { expectToThrowFuelError, generateTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/transaction-response.test.ts b/packages/fuel-gauge/src/transaction-response.test.ts index 9feeecec8f..df02414420 100644 --- a/packages/fuel-gauge/src/transaction-response.test.ts +++ b/packages/fuel-gauge/src/transaction-response.test.ts @@ -1,6 +1,4 @@ -import { generateTestWallet, launchNode } from '@fuel-ts/account/test-utils'; import { ErrorCode } from '@fuel-ts/errors'; -import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; import { FUEL_NETWORK_URL, Provider, @@ -10,6 +8,7 @@ import { WalletUnlocked, ScriptTransactionRequest, } from 'fuels'; +import { generateTestWallet, launchNode, expectToThrowFuelError } from 'fuels/test-utils'; import type { MockInstance } from 'vitest'; async function verifyKeepAliveMessageWasSent(subscriptionStream: ReadableStream) { diff --git a/packages/fuel-gauge/src/transaction-summary.test.ts b/packages/fuel-gauge/src/transaction-summary.test.ts index 4ca4af7b3a..a51d2fdd07 100644 --- a/packages/fuel-gauge/src/transaction-summary.test.ts +++ b/packages/fuel-gauge/src/transaction-summary.test.ts @@ -1,5 +1,3 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import { ASSET_A, ASSET_B } from '@fuel-ts/utils/test-utils'; import type { WalletUnlocked, TransactionResultReceipt, @@ -21,6 +19,7 @@ import { AddressType, OperationName, } from 'fuels'; +import { generateTestWallet, ASSET_A, ASSET_B } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum } from '../test/fixtures'; diff --git a/packages/fuel-gauge/src/utils.ts b/packages/fuel-gauge/src/utils.ts index 2b3dd9bdae..853f2ab76c 100644 --- a/packages/fuel-gauge/src/utils.ts +++ b/packages/fuel-gauge/src/utils.ts @@ -1,8 +1,7 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; -import { ASSET_A } from '@fuel-ts/utils/test-utils'; import { readFileSync } from 'fs'; import type { Interface, Contract, WalletUnlocked, JsonAbi, BytesLike } from 'fuels'; import { Script, Provider, ContractFactory, FUEL_NETWORK_URL } from 'fuels'; +import { ASSET_A, generateTestWallet } from 'fuels/test-utils'; import { join } from 'path'; let contractInstance: Contract; diff --git a/packages/fuel-gauge/src/vector-types.test.ts b/packages/fuel-gauge/src/vector-types.test.ts index 75a7727dba..7700d797b7 100644 --- a/packages/fuel-gauge/src/vector-types.test.ts +++ b/packages/fuel-gauge/src/vector-types.test.ts @@ -1,6 +1,6 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; import type { BigNumberish } from 'fuels'; import { bn, Predicate, Wallet, Address, Provider, FUEL_NETWORK_URL } from 'fuels'; +import { generateTestWallet } from 'fuels/test-utils'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../test/fixtures'; diff --git a/packages/fuel-gauge/test/fixtures/index.ts b/packages/fuel-gauge/test/fixtures/index.ts index 2390a7ea41..444dbe8713 100644 --- a/packages/fuel-gauge/test/fixtures/index.ts +++ b/packages/fuel-gauge/test/fixtures/index.ts @@ -1,5 +1,5 @@ -import { getForcProject } from '@fuel-ts/utils/test-utils'; import type { JsonAbi } from 'fuels'; +import { getForcProject } from 'fuels/test-utils'; import { join } from 'path'; export enum FuelGaugeProjectsEnum { diff --git a/packages/fuels/package.json b/packages/fuels/package.json index 2a538c38c8..6338596ddd 100644 --- a/packages/fuels/package.json +++ b/packages/fuels/package.json @@ -27,6 +27,11 @@ "require": "./dist/test-utils.js", "import": "./dist/test-utils.mjs", "types": "./dist/test-utils.d.ts" + }, + "./cli-utils": { + "require": "./dist/cli-utils.js", + "import": "./dist/cli-utils.mjs", + "types": "./dist/cli-utils.d.ts" } }, "typesVersions": { @@ -36,6 +41,9 @@ ], "test-utils": [ "./dist/test-utils.d.ts" + ], + "./cli-utils": [ + "/dist/cli-utils.d.ts" ] } }, diff --git a/packages/fuels/src/cli-utils.ts b/packages/fuels/src/cli-utils.ts new file mode 100644 index 0000000000..c34747c107 --- /dev/null +++ b/packages/fuels/src/cli-utils.ts @@ -0,0 +1 @@ +export * from '@fuel-ts/utils/cli-utils'; diff --git a/packages/fuels/src/cli/commands/deploy/createWallet.test.ts b/packages/fuels/src/cli/commands/deploy/createWallet.test.ts index fcaef81ec2..fadeacd9bc 100644 --- a/packages/fuels/src/cli/commands/deploy/createWallet.test.ts +++ b/packages/fuels/src/cli/commands/deploy/createWallet.test.ts @@ -1,6 +1,7 @@ import { FUEL_NETWORK_URL } from '@fuel-ts/account/configs'; import { ErrorCode } from '@fuel-ts/errors'; -import { expectToThrowFuelError, safeExec } from '@fuel-ts/errors/test-utils'; + +import { expectToThrowFuelError, safeExec } from '../../../test-utils'; import { createWallet } from './createWallet'; diff --git a/packages/fuels/src/cli/commands/dev/autoStartFuelCore.test.ts b/packages/fuels/src/cli/commands/dev/autoStartFuelCore.test.ts index 40dafed638..53f87ded6b 100644 --- a/packages/fuels/src/cli/commands/dev/autoStartFuelCore.test.ts +++ b/packages/fuels/src/cli/commands/dev/autoStartFuelCore.test.ts @@ -1,8 +1,8 @@ -import * as testUtilsMod from '@fuel-ts/account/test-utils'; import { existsSync, rmSync } from 'fs'; import { join } from 'path'; import { fuelsConfig } from '../../../../test/fixtures/fuels.config'; +import * as testUtilsMod from '../../../test-utils'; import type { FuelsConfig } from '../../types'; import type { FuelCoreNode } from './autoStartFuelCore'; @@ -32,6 +32,7 @@ describe('autoStartFuelCore', () => { cleanup: () => {}, ip: '0.0.0.0', port: '4000', + url: 'http://127.0.0.1:4000/v1/graphql', snapshotDir: '/some/path', }) ); diff --git a/packages/fuels/src/cli/commands/dev/autoStartFuelCore.ts b/packages/fuels/src/cli/commands/dev/autoStartFuelCore.ts index dd538e200a..26e4506b23 100644 --- a/packages/fuels/src/cli/commands/dev/autoStartFuelCore.ts +++ b/packages/fuels/src/cli/commands/dev/autoStartFuelCore.ts @@ -1,8 +1,8 @@ -import { launchNode } from '@fuel-ts/account/test-utils'; import { defaultConsensusKey } from '@fuel-ts/utils'; import type { ChildProcessWithoutNullStreams } from 'child_process'; import { getPortPromise } from 'portfinder'; +import { launchNode } from '../../../test-utils'; import type { FuelsConfig } from '../../types'; import { log, loggingConfig } from '../../utils/logger'; diff --git a/packages/fuels/src/cli/commands/dev/index.test.ts b/packages/fuels/src/cli/commands/dev/index.test.ts index 9bbdbb714f..2dccd88575 100644 --- a/packages/fuels/src/cli/commands/dev/index.test.ts +++ b/packages/fuels/src/cli/commands/dev/index.test.ts @@ -1,9 +1,9 @@ -import { safeExec } from '@fuel-ts/errors/test-utils'; import type { FSWatcher } from 'chokidar'; import { fuelsConfig } from '../../../../test/fixtures/fuels.config'; import { mockStartFuelCore } from '../../../../test/utils/mockAutoStartFuelCore'; import { mockLogger } from '../../../../test/utils/mockLogger'; +import { safeExec } from '../../../test-utils'; import * as loadConfigMod from '../../config/loadConfig'; import type { FuelsConfig } from '../../types'; import * as buildMod from '../build'; diff --git a/packages/fuels/src/cli/config/forcUtils.test.ts b/packages/fuels/src/cli/config/forcUtils.test.ts index 1cbc972d94..424db95c26 100644 --- a/packages/fuels/src/cli/config/forcUtils.test.ts +++ b/packages/fuels/src/cli/config/forcUtils.test.ts @@ -1,4 +1,4 @@ -import { safeExec } from '@fuel-ts/errors/test-utils'; +import { safeExec } from '../../test-utils'; import { readForcToml } from './forcUtils'; diff --git a/packages/fuels/src/cli/config/loadConfig.test.ts b/packages/fuels/src/cli/config/loadConfig.test.ts index c696215dc8..e38bb1b604 100644 --- a/packages/fuels/src/cli/config/loadConfig.test.ts +++ b/packages/fuels/src/cli/config/loadConfig.test.ts @@ -1,4 +1,3 @@ -import { safeExec } from '@fuel-ts/errors/test-utils'; import { readFileSync } from 'fs'; import { resolve } from 'path'; @@ -8,6 +7,7 @@ import { resetConfigAndMocks, resetDiskAndMocks, } from '../../../test/utils/runCommands'; +import { safeExec } from '../../test-utils'; import type { FuelsConfig } from '../types'; import { readForcToml, readSwayType } from './forcUtils'; @@ -56,7 +56,6 @@ describe('loadConfig', () => { const libraries = readForcToml(paths.workspaceDir) .workspace.members.map((member) => resolve(paths.workspaceDir, member)) .map((member) => readSwayType(member)) - // @ts-expect-error should be SwayType enum which doesn't include library .filter((type) => type === 'library'); expect(libraries.length).toEqual(1); diff --git a/packages/fuels/src/cli/config/loadConfig.ts b/packages/fuels/src/cli/config/loadConfig.ts index beedad86e9..640f966fe6 100644 --- a/packages/fuels/src/cli/config/loadConfig.ts +++ b/packages/fuels/src/cli/config/loadConfig.ts @@ -1,11 +1,11 @@ import { FUEL_NETWORK_URL } from '@fuel-ts/account/configs'; import { defaultConsensusKey } from '@fuel-ts/utils'; -import { tryFindBinaries } from '@fuel-ts/utils/cli-utils'; import { bundleRequire } from 'bundle-require'; import type { BuildOptions } from 'esbuild'; import JoyCon from 'joycon'; import { resolve, parse } from 'path'; +import { tryFindBinaries } from '../../cli-utils'; import type { FuelsConfig, UserFuelsConfig } from '../types'; import { SwayType, readForcToml, readSwayType } from './forcUtils'; diff --git a/packages/fuels/src/setup-launch-node-server.ts b/packages/fuels/src/setup-launch-node-server.ts index f8d09deac9..8700199554 100644 --- a/packages/fuels/src/setup-launch-node-server.ts +++ b/packages/fuels/src/setup-launch-node-server.ts @@ -1,10 +1,10 @@ /* eslint-disable no-console */ -import type { LaunchNodeOptions } from '@fuel-ts/account/test-utils'; -import { launchNode } from '@fuel-ts/account/test-utils'; -import { waitUntilUnreachable } from '@fuel-ts/utils/test-utils'; import http from 'http'; import type { AddressInfo } from 'net'; +import type { LaunchNodeOptions } from './test-utils'; +import { waitUntilUnreachable, launchNode } from './test-utils'; + process.setMaxListeners(Infinity); async function parseBody(req: http.IncomingMessage): Promise { diff --git a/packages/fuels/src/test-utils.ts b/packages/fuels/src/test-utils.ts index 4d63de50ed..fa63639731 100644 --- a/packages/fuels/src/test-utils.ts +++ b/packages/fuels/src/test-utils.ts @@ -1,2 +1,4 @@ export * from '@fuel-ts/contract/test-utils'; export * from '@fuel-ts/account/test-utils'; +export * from '@fuel-ts/errors/test-utils'; +export * from '@fuel-ts/utils/test-utils'; diff --git a/packages/fuels/tsup.config.ts b/packages/fuels/tsup.config.ts index 7d2b378886..1d91714dbe 100644 --- a/packages/fuels/tsup.config.ts +++ b/packages/fuels/tsup.config.ts @@ -6,6 +6,7 @@ const options: Options = { entry: { ...indexBinAndCliConfig.entry, 'test-utils': 'src/test-utils.ts', + 'cli-utils': 'src/cli-utils.ts', }, loader: { '.hbs': 'text',