feat: optimise run time for integration tests

Author: viraj124

packages/integration-tests/fork-tests/bridge_erc20.ts

@@ -20,6 +20,7 @@ import {
   getBlock,
   FUEL_CALL_TX_PARAMS,
   hardhatSkipTime,
+  fuels_parseEther,
 } from '@fuel-bridge/test-utils';
 import chai from 'chai';
 import { toBeHex, parseEther } from 'ethers';
@@ -32,8 +33,8 @@ import type {
   Provider,
 } from 'fuels';
 
-import type { Containers } from '../docker-setup/docker';
 import { startContainers } from '../docker-setup/docker';
+import { fundWithdrawalTransactionWithBaseAssetResource } from '../utils/utils';
 
 const { expect } = chai;
 
@@ -52,8 +53,6 @@ describe('Bridging ERC20 tokens', async function () {
   let fuel_bridgeContractId: string;
   let fuel_testAssetId: string;
 
-  let containers: Containers;
-
   // override the default test timeout from 2000ms
   this.timeout(DEFAULT_TIMEOUT_MS);
 
@@ -66,7 +65,8 @@ describe('Bridging ERC20 tokens', async function () {
     fuelTokenSender: FuelWallet,
     ethereumTokenReceiverAddress: string,
     NUM_TOKENS: bigint,
-    DECIMAL_DIFF: bigint
+    DECIMAL_DIFF: bigint,
+    useMessageCoin: boolean
   ): Promise<MessageProof | null> {
     // withdraw tokens back to the base chain
     fuel_bridge.account = fuelTokenSender;
@@ -75,22 +75,19 @@ describe('Bridging ERC20 tokens', async function () {
     const fuelTokenSenderBalance = await fuelTokenSender.getBalance(
       fuel_testAssetId
     );
-    const transactionRequest = await fuel_bridge.functions
-      .withdraw(paddedAddress)
-      .addContracts([fuel_bridge, fuel_bridgeImpl])
-      .txParams({
-        tip: 0,
-        maxFee: 1,
-      })
-      .callParams({
-        forward: {
-          amount: new BN(NUM_TOKENS.toString()).div(
-            new BN(DECIMAL_DIFF.toString())
-          ),
-          assetId: fuel_testAssetId,
-        },
-      })
-      .fundWithRequiredCoins();
+
+    const transactionRequest =
+      await fundWithdrawalTransactionWithBaseAssetResource(
+        env,
+        fuel_bridge,
+        fuelTokenSender,
+        paddedAddress,
+        NUM_TOKENS,
+        9n,
+        fuel_bridgeImpl,
+        fuel_testAssetId,
+        useMessageCoin
+      );
 
     const tx = await fuelTokenSender.sendTransaction(transactionRequest);
     const fWithdrawTxResult = await tx.waitForResult();
@@ -208,14 +205,9 @@ describe('Bridging ERC20 tokens', async function () {
 
   before(async () => {
     // spinning up all docker containers
-    containers = await startContainers(true, 8080, 8545, 4000);
-
-    env = await setupEnvironment({
-      http_ethereum_client: 'http://127.0.0.1:8545',
-      http_deployer: 'http://127.0.0.1:8080',
-      http_fuel_client: 'http://127.0.0.1:4000/v1/graphql',
-    });
+    await startContainers();
 
+    env = await setupEnvironment({});
     eth_erc20GatewayAddress = (
       await env.eth.fuelERC20Gateway.getAddress()
     ).toLowerCase();
@@ -309,6 +301,59 @@ describe('Bridging ERC20 tokens', async function () {
       );
     });
 
+    it('Bridge ETH to Fuel to be used as Message Coin during token withdrawal', async () => {
+      // use the FuelMessagePortal to directly send ETH which should be immediately spendable
+      const tx = await env.eth.fuelMessagePortal
+        .connect(ethereumTokenSender)
+        .depositETH(fuelTokenReceiverAddress, {
+          value: parseEther('1'),
+        });
+      const receipt = await tx.wait();
+      expect(receipt.status).to.equal(1);
+
+      // parse events from logs
+      const filter = env.eth.fuelMessagePortal.filters.MessageSent(
+        null, // Args set to null since there should be just 1 event for MessageSent
+        null,
+        null,
+        null,
+        null
+      );
+
+      const [event, ...restOfEvents] =
+        await env.eth.fuelMessagePortal.queryFilter(
+          filter,
+          receipt.blockNumber,
+          receipt.blockNumber
+        );
+      expect(restOfEvents.length).to.be.eq(0); // Should be only 1 event
+
+      const fuelETHMessageNonce = new BN(event.args.nonce.toString());
+
+      fuelTokenMessageReceiver = fuelTokenReceiver.address;
+
+      // wait for message to appear in fuel client
+      expect(
+        await waitForMessage(
+          env.fuel.provider,
+          fuelTokenMessageReceiver,
+          fuelETHMessageNonce,
+          FUEL_MESSAGE_TIMEOUT_MS
+        )
+      ).to.not.be.null;
+
+      // verify the incoming messages generated when base asset is minted on fuel
+      const incomingMessagesonFuel = await env.fuel.signers[0].getMessages();
+
+      // eth as bridged once at the start
+      expect(incomingMessagesonFuel.messages.length === 1).to.be.true;
+
+      // 1 eth was bridged
+      expect(
+        incomingMessagesonFuel.messages[0].amount.eq(fuels_parseEther('1'))
+      ).to.be.true;
+    });
+
     it('Bridge ERC20 via FuelERC20Gateway', async () => {
       // approve FuelERC20Gateway to spend the tokens
       await eth_testToken
@@ -468,7 +513,8 @@ describe('Bridging ERC20 tokens', async function () {
         fuelTokenSender,
         ethereumTokenReceiverAddress,
         NUM_TOKENS,
-        DECIMAL_DIFF
+        DECIMAL_DIFF,
+        true
       );
     });
 
@@ -586,7 +632,8 @@ describe('Bridging ERC20 tokens', async function () {
         fuelTokenSender,
         ethereumTokenReceiverAddress,
         NUM_TOKENS,
-        DECIMAL_DIFF
+        DECIMAL_DIFF,
+        false
       );
 
       // relay message
@@ -679,14 +726,4 @@ describe('Bridging ERC20 tokens', async function () {
       ).to.be.true;
     });
   });
-
-  // stopping containers post the test
-  after(async () => {
-    await containers.postGresContainer.stop();
-    await containers.l1_node.stop();
-
-    await containers.fuel_node.stop();
-
-    await containers.block_committer.stop();
-  });
 });

packages/integration-tests/fork-tests/transfer_eth.ts

@@ -20,8 +20,7 @@ import type {
   Provider,
 } from 'fuels';
 
-import type { Containers } from '../docker-setup/docker';
-import { startContainers } from '../docker-setup/docker';
+import { stopEnvironment } from '../docker-setup/docker';
 
 const { expect } = chai;
 
@@ -33,8 +32,6 @@ describe('Transferring ETH', async function () {
 
   let env: TestEnvironment;
 
-  let containers: Containers;
-
   // override the default test timeout of 2000ms
   this.timeout(DEFAULT_TIMEOUT_MS);
 
@@ -136,15 +133,7 @@ describe('Transferring ETH', async function () {
   }
 
   before(async () => {
-    // spinning up all docker containers
-    containers = await startContainers(true, 9090, 7545, 3000);
-
-    env = await setupEnvironment({
-      http_ethereum_client: 'http://127.0.0.1:7545',
-      http_deployer: 'http://127.0.0.1:9090',
-      http_fuel_client: 'http://127.0.0.1:3000/v1/graphql',
-    });
-
+    env = await setupEnvironment({});
     BASE_ASSET_ID = env.fuel.provider.getBaseAssetId();
   });
 
@@ -481,11 +470,6 @@ describe('Transferring ETH', async function () {
 
   // stopping containers post the test
   after(async () => {
-    await containers.postGresContainer.stop();
-    await containers.l1_node.stop();
-
-    await containers.fuel_node.stop();
-
-    await containers.block_committer.stop();
+    await stopEnvironment();
   });
 });