Merge branch 'master' into st/docs/add-cache-utxo-to-provider-section

FuelLabs · Jul 2, 2024 · 29109a1 · 29109a1
2 parents ec370c9 + 041805f
commit 29109a1
Show file tree

Hide file tree

Showing 70 changed files with 111 additions and 102 deletions.
diff --git a/.changeset/four-flowers-yawn.md 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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