test: update test utilities and environment configuration

- Update test utilities for new environment configuration
- Update environment preparation scripts for multi-env support
- Update dapp e2e tests for new environment configuration
- Improve test environment setup for CI/CD workflows

Author: abbesBenayache

dapp/tests/e2e/app.test.js

@@ -316,7 +316,7 @@ describe('sendEmail', () => {
 
   if (
     // runs in CI with services credentials
-    process.env.DRONE ||
+    process.env.GITHUB_ACTIONS ||
     // or locally when all credentials are set
     (process.env.MJ_APIKEY_PUBLIC &&
       process.env.MJ_APIKEY_PRIVATE &&
@@ -343,7 +343,7 @@ describe('sendEmail', () => {
 
         // requester secret setup
         process.env.IEXEC_REQUESTER_SECRET_1 = JSON.stringify({
-          emailSubject: `web3mail test ${process.env.DRONE_COMMIT}`,
+          emailSubject: `web3mail test ${process.env.GITHUB_SHA}`,
           emailContentMultiAddr:
             '/ipfs/QmVodr1Bxa2bTiz1pLmWjDrCeTEdGPfe58qRMRwErJDcRu',
           emailContentEncryptionKey:

tests/scripts/prepare-bellecour-fork-for-tests.js

@@ -9,8 +9,6 @@ import {
   toBeHex,
 } from 'ethers';
 
-const { DRONE } = process.env;
-
 const VOUCHER_HUB_ADDRESS = '0x3137B6DF4f36D338b82260eDBB2E7bab034AFEda';
 const TARGET_VOUCHER_MANAGER_WALLET =
   '0x44cA21A3c4efE9B1A0268e2e9B2547E7d9C8f19C'; // Should be same wallet as TEST_CHAIN.voucherManagerWallet
@@ -23,7 +21,7 @@ const LEARN_WORKERPOOL_ENS = 'prod-v8-learn.main.pools.iexec.eth';
 const PROD_WORKERPOOL_ENS = 'prod-v8-bellecour.main.pools.iexec.eth';
 const WEB3_MAIL_DAPP_ADDRESS_ENS = 'web3mail.apps.iexec.eth';
 
-const rpcURL = DRONE ? 'http://bellecour-fork:8545' : 'http://127.0.0.1:8545';
+const rpcURL = 'http://127.0.0.1:8545';
 
 const provider = new JsonRpcProvider(
   rpcURL,
@@ -42,7 +40,7 @@ const WEB3_MAIL_DAPP_ADDRESS = await provider.resolveName(
 );
 
 const setBalance = async (address, weiAmount) => {
-  fetch(rpcURL, {
+  await fetch(rpcURL, {
     method: 'POST',
     body: JSON.stringify({
       method: 'anvil_setBalance',

tests/scripts/prepare-test-env.js

@@ -1,7 +1,6 @@
-import { mkdirSync, writeFileSync } from 'fs';
-import { join } from 'path';
+import { writeFileSync } from 'fs';
 
-const forkUrl = process.env.BELLECOUR_FORK_URL || 'https://bellecour.iex.ec';
+const forkUrl = 'https://bellecour.iex.ec';
 
 fetch(forkUrl, {
   method: 'POST',
@@ -15,31 +14,19 @@ fetch(forkUrl, {
   .then((res) => res.json())
   .then((jsonRes) => {
     const forkBlockNumber = parseInt(jsonRes.result.substring(2), 16);
-    if (process.env.DRONE) {
-      const LOCAL_STACK_ENV_DIR = 'local-stack-env';
-      console.log(
-        `Creating ${LOCAL_STACK_ENV_DIR} directory for drone test-stack`
-      );
-      mkdirSync(LOCAL_STACK_ENV_DIR, { recursive: true });
-      writeFileSync(join(LOCAL_STACK_ENV_DIR, 'BELLECOUR_FORK_URL'), forkUrl);
-      writeFileSync(
-        join(LOCAL_STACK_ENV_DIR, 'BELLECOUR_FORK_BLOCK'),
-        `${forkBlockNumber}`
-      );
-    } else {
-      console.log('Creating .env file for docker-compose test-stack');
-      writeFileSync(
-        '.env',
-        `############ THIS FILE IS GENERATED ############
+
+    console.log('Creating .env file for docker-compose test-stack');
+    writeFileSync(
+      '.env',
+      `############ THIS FILE IS GENERATED ############
 # run "node prepare-test-env.js" to regenerate #
 ################################################
 
 # blockchain node to use as the reference for the local fork
 BELLECOUR_FORK_URL=${forkUrl}
 # block number to fork from
 BELLECOUR_FORK_BLOCK=${forkBlockNumber}`
-      );
-    }
+    );
   })
   .catch((e) => {
     throw Error(`Failed to get current block number from ${forkUrl}: ${e}`);

tests/test-utils.ts

@@ -10,24 +10,16 @@ import { randomInt } from 'crypto';
 import { getSignerFromPrivateKey } from 'iexec/utils';
 
 export const TEST_CHAIN = {
-  rpcURL: process.env.DRONE
-    ? 'http://bellecour-fork:8545'
-    : 'http://127.0.0.1:8545',
+  rpcURL: 'http://127.0.0.1:8545',
   chainId: '134',
-  smsURL: process.env.DRONE ? 'http://sms:13300' : 'http://127.0.0.1:13300',
-  resultProxyURL: process.env.DRONE
-    ? 'http://result-proxy:13200'
-    : 'http://127.0.0.1:13200',
-  iexecGatewayURL: process.env.DRONE
-    ? 'http://market-api:3000'
-    : 'http://127.0.0.1:3000',
+  smsURL: 'http://127.0.0.1:13300',
+  resultProxyURL: 'http://127.0.0.1:13200',
+  iexecGatewayURL: 'http://127.0.0.1:3000',
   voucherHubAddress: '0x3137B6DF4f36D338b82260eDBB2E7bab034AFEda',
   voucherManagerWallet: new Wallet(
     '0x2c906d4022cace2b3ee6c8b596564c26c4dcadddf1e949b769bcb0ad75c40c33'
   ),
-  voucherSubgraphURL: process.env.DRONE
-    ? 'http://graphnode:8000/subgraphs/name/bellecour/iexec-voucher'
-    : 'http://127.0.0.1:8000/subgraphs/name/bellecour/iexec-voucher',
+  voucherSubgraphURL: 'http://127.0.0.1:8000/subgraphs/name/bellecour/iexec-voucher',
   learnProdWorkerpool: 'prod-v8-learn.main.pools.iexec.eth',
   learnProdWorkerpoolOwnerWallet: new Wallet(
     '0x800e01919eadf36f110f733decb1cc0f82e7941a748e89d7a3f76157f6654bb3'
@@ -40,7 +32,7 @@ export const TEST_CHAIN = {
     '0xa911b93e50f57c156da0b8bff2277d241bcdb9345221a3e246a99c6e7cedcde5'
   ),
   provider: new JsonRpcProvider(
-    process.env.DRONE ? 'http://bellecour-fork:8545' : 'http://127.0.0.1:8545',
+    'http://127.0.0.1:8545',
     undefined,
     {
       pollingInterval: 1000, // speed up tests
@@ -94,13 +86,10 @@ export const getTestConfig = (
   const ethProvider = getTestWeb3SignerProvider(privateKey);
   const options = {
     iexecOptions: getTestIExecOption(),
-    ipfsGateway: process.env.DRONE
-      ? 'http://ipfs:8080'
-      : 'http://127.0.0.1:8080',
-    ipfsNode: process.env.DRONE ? 'http://ipfs:5001' : 'http://127.0.0.1:5001',
-    dataProtectorSubgraph: process.env.DRONE
-      ? 'http://graphnode:8000/subgraphs/name/DataProtector-v2'
-      : 'http://127.0.0.1:8000/subgraphs/name/DataProtector-v2',
+    ipfsGateway: 'http://127.0.0.1:8080',
+    ipfsNode: 'http://127.0.0.1:5001',
+    dataProtectorSubgraph:
+      'http://127.0.0.1:8000/subgraphs/name/DataProtector-v2',
   };
   return [ethProvider, options];
 };