refactor: add a utils section for integration tests

FuelLabs · Jan 6, 2025 · 5208aa6 · 5208aa6
1 parent 6572fac
commit 5208aa6
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git a/packages/solidity-contracts/integration-tests/bridge_erc20.ts b/packages/solidity-contracts/integration-tests/bridge_erc20.ts
@@ -14,7 +14,6 @@ import type { Token } from '../typechain';
 
 // due to cyclic workspace dependencies with test-utils package, the CI which runs `pnpm forc fmt --check` was getting timed out
 // so hence had to re-use some test helpers in the test-utils package
-import { FUEL_CALL_TX_PARAMS, FUEL_TX_PARAMS } from './constants';
 import { createRelayMessageParams, waitForBlockFinalization } from './ethers';
 import { getOrDeployECR20Contract } from './ethers/getOrDeployECR20Contract';
 import { hardhatSkipTime } from './ethers/hardhatSkipTime';
@@ -24,6 +23,7 @@ import { getTokenId } from './fuels/getTokenId';
 import { relayCommonMessage } from './fuels/relayCommonMessage';
 import type { TestEnvironment } from './setup/setup';
 import { setupEnvironment } from './setup/setup';
+import { FUEL_CALL_TX_PARAMS, FUEL_TX_PARAMS } from './utils/constants';
 
 const { expect } = chai;
 

diff --git a/packages/solidity-contracts/integration-tests/ethers/getOrDeployECR20Contract.ts b/packages/solidity-contracts/integration-tests/ethers/getOrDeployECR20Contract.ts
@@ -2,8 +2,8 @@ import { parseEther } from 'ethers';
 
 import type { Token } from '../../typechain';
 import { Token__factory } from '../../typechain';
-import { debug } from '../debug';
 import type { TestEnvironment } from '../setup/setup';
+import { debug } from '../utils/debug';
 
 const { ETH_ERC20_TOKEN_ADDRESS } = process.env;
 const ETHEREUM_ETH_DECIMALS = 18n;

diff --git a/packages/solidity-contracts/integration-tests/fuels/getOrDeployL2Bridge.ts b/packages/solidity-contracts/integration-tests/fuels/getOrDeployL2Bridge.ts
@@ -7,9 +7,9 @@ import {
 import { resolveAddress, type AddressLike } from 'ethers';
 
 // import { BridgeFungibleToken, BridgeFungibleTokenFactory, Proxy, ProxyFactory } from '../../../fungible-token/exports/types/index'
-import { debug } from '../debug';
-import { eth_address_to_b256 } from '../parsers';
 import type { TestEnvironment } from '../setup/setup';
+import { debug } from '../utils/debug';
+import { eth_address_to_b256 } from '../utils/parsers';
 
 const { FUEL_FUNGIBLE_TOKEN_ADDRESS } = process.env;
 

diff --git a/packages/solidity-contracts/integration-tests/fuels/relayCommonMessage.ts b/packages/solidity-contracts/integration-tests/fuels/relayCommonMessage.ts
@@ -24,7 +24,7 @@ import {
   BN,
 } from 'fuels';
 
-import { debug } from '../debug';
+import { debug } from '../utils/debug';
 
 import { resourcesToInputs } from './transaction';
 

diff --git a/packages/solidity-contracts/integration-tests/transfer_eth.ts b/packages/solidity-contracts/integration-tests/transfer_eth.ts
@@ -11,11 +11,11 @@ import type {
 
 // due to cyclic workspace dependencies with test-utils package, the CI which runs `pnpm forc fmt --check` was getting timed out
 // so hence had to re-use some test helpers in the test-utils package
-import { FUEL_CALL_TX_PARAMS } from './constants';
 import { createRelayMessageParams, waitForBlockFinalization } from './ethers';
 import { waitForMessage, getMessageOutReceipt, getBlock } from './fuels';
 import { setupEnvironment, fuels_parseEther } from './setup/setup';
 import type { TestEnvironment } from './setup/setup';
+import { FUEL_CALL_TX_PARAMS } from './utils/constants';
 
 const { expect } = chai;
 

diff --git a/...-contracts/integration-tests/constants.ts → ...acts/integration-tests/utils/constants.ts b/...-contracts/integration-tests/constants.ts → ...acts/integration-tests/utils/constants.ts
diff --git a/...dity-contracts/integration-tests/debug.ts → ...ontracts/integration-tests/utils/debug.ts b/...dity-contracts/integration-tests/debug.ts → ...ontracts/integration-tests/utils/debug.ts
diff --git a/...ty-contracts/integration-tests/parsers.ts → ...tracts/integration-tests/utils/parsers.ts b/...ty-contracts/integration-tests/parsers.ts → ...tracts/integration-tests/utils/parsers.ts