test(e2e): update all e2e tests for multichain config

abbesBenayache · abbesBenayache · commit 9622976fe0a5 · 2025-07-02T16:08:13.000+02:00
diff --git a/tests/e2e/constructor.test.ts b/tests/e2e/constructor.test.ts
@@ -2,15 +2,12 @@
 // needed to access and assert IExecDataProtector's private properties
 import { describe, expect, it } from '@jest/globals';
 import { Wallet } from 'ethers';
-import {
-  DATAPROTECTOR_SUBGRAPH_ENDPOINT,
-  DEFAULT_IPFS_GATEWAY,
-} from '../../src/config/config.js';
 import { IExecWeb3telegram } from '../../src/index.js';
 import {
   getTestWeb3SignerProvider,
   MAX_EXPECTED_WEB2_SERVICES_TIME,
 } from '../test-utils.js';
+import { CHAIN_CONFIG, CHAIN_IDS } from '../../src/config/config.js';
 
 describe('IExecWeb3telegram()', () => {
   it('instantiates with a valid ethProvider', async () => {
@@ -26,8 +23,9 @@ describe('IExecWeb3telegram()', () => {
     const web3telegram = new IExecWeb3telegram(
       getTestWeb3SignerProvider(wallet.privateKey)
     );
+    await web3telegram.init();
     const ipfsGateway = web3telegram['ipfsGateway'];
-    expect(ipfsGateway).toStrictEqual(DEFAULT_IPFS_GATEWAY);
+    expect(ipfsGateway).toStrictEqual(CHAIN_CONFIG[CHAIN_IDS.BELLECOUR].ipfsGateway);
   });
 
   it('should use provided ipfs gateway url when ipfsGateway is provided', async () => {
@@ -39,6 +37,7 @@ describe('IExecWeb3telegram()', () => {
         ipfsGateway: customIpfsGateway,
       }
     );
+    await web3telegram.init();
     const ipfsGateway = web3telegram['ipfsGateway'];
     expect(ipfsGateway).toStrictEqual(customIpfsGateway);
   });
@@ -48,8 +47,9 @@ describe('IExecWeb3telegram()', () => {
     const web3telegram = new IExecWeb3telegram(
       getTestWeb3SignerProvider(wallet.privateKey)
     );
+    await web3telegram.init();
     const graphQLClientUrl = web3telegram['graphQLClient'];
-    expect(graphQLClientUrl['url']).toBe(DATAPROTECTOR_SUBGRAPH_ENDPOINT);
+    expect(graphQLClientUrl['url']).toBe(CHAIN_CONFIG[CHAIN_IDS.BELLECOUR].dataProtectorSubgraph);
   });
 
   it('should use provided data Protector Subgraph URL when subgraphUrl is provided', async () => {
@@ -61,6 +61,7 @@ describe('IExecWeb3telegram()', () => {
         dataProtectorSubgraph: customSubgraphUrl,
       }
     );
+    await web3telegram.init();
     const graphQLClient = web3telegram['graphQLClient'];
     expect(graphQLClient['url']).toBe(customSubgraphUrl);
   });
@@ -89,6 +90,7 @@ describe('IExecWeb3telegram()', () => {
         dappWhitelistAddress: customDappWhitelistAddress,
       }
     );
+    await web3telegram.init();
     const graphQLClient = web3telegram['graphQLClient'];
     const ipfsNode = web3telegram['ipfsNode'];
     const ipfsGateway = web3telegram['ipfsGateway'];
@@ -100,7 +102,7 @@ describe('IExecWeb3telegram()', () => {
     expect(ipfsNode).toStrictEqual(customIpfsNode);
     expect(ipfsGateway).toStrictEqual(customIpfsGateway);
     expect(dappAddressOrENS).toStrictEqual(customDapp);
-    expect(whitelistAddress).toStrictEqual(customDappWhitelistAddress);
+    expect(whitelistAddress).toStrictEqual(customDappWhitelistAddress.toLowerCase());
     expect(await iexec.config.resolveSmsURL()).toBe(smsURL);
     expect(await iexec.config.resolveIexecGatewayURL()).toBe(iexecGatewayURL);
   });
diff --git a/tests/e2e/fetchMyContacts.test.ts b/tests/e2e/fetchMyContacts.test.ts
@@ -1,17 +1,19 @@
+import { describe, expect, it } from '@jest/globals';
 import { IExecDataProtector } from '@iexec/dataprotector';
-import { beforeAll, describe, expect, it } from '@jest/globals';
+import { IExecWeb3telegram } from '../../src/index.js';
+import { CHAIN_CONFIG, CHAIN_IDS } from '../../src/config/config.js';
+import {
+  getTestConfig,
+  waitSubgraphIndexing,
+} from '../test-utils.js';
 import { HDNodeWallet, Wallet } from 'ethers';
 import { NULL_ADDRESS } from 'iexec/utils';
-import { WEB3TELEGRAM_DAPP_ADDRESS } from '../../src/config/config.js';
-import { IExecWeb3telegram } from '../../src/index.js';
 import {
   MAX_EXPECTED_BLOCKTIME,
   MAX_EXPECTED_WEB2_SERVICES_TIME,
   deployRandomDataset,
-  getTestConfig,
   getTestWeb3SignerProvider,
   getTestIExecOption,
-  waitSubgraphIndexing,
 } from '../test-utils.js';
 import IExec from 'iexec/IExec';
 
@@ -36,7 +38,7 @@ describe('web3telegram.fetchMyContacts()', () => {
     'pass with a granted access for a specific requester',
     async () => {
       await dataProtector.core.grantAccess({
-        authorizedApp: WEB3TELEGRAM_DAPP_ADDRESS,
+        authorizedApp: CHAIN_CONFIG[CHAIN_IDS.BELLECOUR].dappAddress,
         protectedData: protectedData.address,
         authorizedUser: wallet.address,
       });
@@ -46,11 +48,11 @@ describe('web3telegram.fetchMyContacts()', () => {
       });
       expect(
         foundContactForASpecificRequester &&
-          foundContactForASpecificRequester.address
+        foundContactForASpecificRequester.address
       ).toBeDefined();
       expect(
         foundContactForASpecificRequester &&
-          foundContactForASpecificRequester.address
+        foundContactForASpecificRequester.address
       ).toBe(protectedData.address.toLocaleLowerCase());
     },
     MAX_EXPECTED_WEB2_SERVICES_TIME
@@ -61,7 +63,7 @@ describe('web3telegram.fetchMyContacts()', () => {
     async () => {
       const grantedAccessForAnyRequester = await dataProtector.core.grantAccess(
         {
-          authorizedApp: WEB3TELEGRAM_DAPP_ADDRESS,
+          authorizedApp: CHAIN_CONFIG[CHAIN_IDS.BELLECOUR].dappAddress,
           protectedData: protectedData.address,
           authorizedUser: NULL_ADDRESS,
         }
@@ -101,7 +103,7 @@ describe('web3telegram.fetchMyContacts()', () => {
       const encryptionKey = await iexec.dataset.generateEncryptionKey();
       await iexec.dataset.pushDatasetSecret(dataset.address, encryptionKey);
       await dataProtector.core.grantAccess({
-        authorizedApp: WEB3TELEGRAM_DAPP_ADDRESS,
+        authorizedApp: CHAIN_CONFIG[CHAIN_IDS.BELLECOUR].dappAddress,
         protectedData: dataset.address,
         authorizedUser: wallet.address,
       });
@@ -123,7 +125,7 @@ describe('web3telegram.fetchMyContacts()', () => {
       await waitSubgraphIndexing();
 
       await dataProtector.core.grantAccess({
-        authorizedApp: WEB3TELEGRAM_DAPP_ADDRESS,
+        authorizedApp: CHAIN_CONFIG[CHAIN_IDS.BELLECOUR].dappAddress,
         protectedData: notValidProtectedData.address,
         authorizedUser: wallet.address,
       });
diff --git a/tests/e2e/fetchUserContacts.test.ts b/tests/e2e/fetchUserContacts.test.ts
@@ -4,7 +4,7 @@ import {
 } from '@iexec/dataprotector';
 import { beforeAll, describe, expect, it } from '@jest/globals';
 import { HDNodeWallet, Wallet } from 'ethers';
-import { WEB3TELEGRAM_DAPP_ADDRESS } from '../../src/config/config.js';
+import { CHAIN_CONFIG, CHAIN_IDS } from '../../src/config/config.js';
 import { IExecWeb3telegram, WorkflowError } from '../../src/index.js';
 import {
   MAX_EXPECTED_BLOCKTIME,
@@ -45,13 +45,13 @@ describe('web3telegram.fetchMyContacts()', () => {
       const user1 = Wallet.createRandom().address;
       const user2 = Wallet.createRandom().address;
       await dataProtector.grantAccess({
-        authorizedApp: WEB3TELEGRAM_DAPP_ADDRESS,
+        authorizedApp: CHAIN_CONFIG[CHAIN_IDS.BELLECOUR].dappAddress,
         protectedData: protectedData1.address,
         authorizedUser: user1,
       });
 
       await dataProtector.grantAccess({
-        authorizedApp: WEB3TELEGRAM_DAPP_ADDRESS,
+        authorizedApp: CHAIN_CONFIG[CHAIN_IDS.BELLECOUR].dappAddress,
         protectedData: protectedData2.address,
         authorizedUser: user2,
       });
@@ -72,7 +72,7 @@ describe('web3telegram.fetchMyContacts()', () => {
     async () => {
       const userWithAccess = Wallet.createRandom().address;
       await dataProtector.grantAccess({
-        authorizedApp: WEB3TELEGRAM_DAPP_ADDRESS,
+        authorizedApp: CHAIN_CONFIG[CHAIN_IDS.BELLECOUR].dappAddress,
         protectedData: protectedData1.address,
         authorizedUser: userWithAccess,
       });
diff --git a/tests/e2e/sendTelegram.test.ts b/tests/e2e/sendTelegram.test.ts
@@ -4,10 +4,7 @@ import {
 } from '@iexec/dataprotector';
 import { beforeAll, describe, expect, it } from '@jest/globals';
 import { HDNodeWallet } from 'ethers';
-import {
-  WEB3TELEGRAM_DAPP_ADDRESS,
-  WHITELIST_SMART_CONTRACT_ADDRESS,
-} from '../../src/config/config.js';
+import { CHAIN_CONFIG, CHAIN_IDS } from '../../src/config/config.js';
 import { IExecWeb3telegram, WorkflowError } from '../../src/index.js';
 import {
   MAX_EXPECTED_BLOCKTIME,
@@ -67,7 +64,7 @@ describe('web3telegram.sendTelegram()', () => {
     const resourceProvider = new IExec({ ethProvider }, iexecOptions);
     await createAndPublishAppOrders(
       resourceProvider,
-      WEB3TELEGRAM_DAPP_ADDRESS
+      CHAIN_CONFIG[CHAIN_IDS.BELLECOUR].dappAddress
     );
 
     learnProdWorkerpoolAddress = await resourceProvider.ens.resolveName(
@@ -104,7 +101,7 @@ describe('web3telegram.sendTelegram()', () => {
       iexecOptions
     );
     await dataProtector.grantAccess({
-      authorizedApp: WEB3TELEGRAM_DAPP_ADDRESS,
+      authorizedApp: CHAIN_CONFIG[CHAIN_IDS.BELLECOUR].dappAddress,
       protectedData: validProtectedData.address,
       authorizedUser: consumerWallet.address, // consumer wallet
       numberOfAccess: 1000,
@@ -297,7 +294,7 @@ describe('web3telegram.sendTelegram()', () => {
 
       //grant access to whitelist
       await dataProtector.grantAccess({
-        authorizedApp: WHITELIST_SMART_CONTRACT_ADDRESS, //whitelist address
+        authorizedApp: CHAIN_CONFIG[CHAIN_IDS.BELLECOUR].whitelistSmartContract, //whitelist address
         protectedData: protectedDataForWhitelist.address,
         authorizedUser: consumerWallet.address, // consumer wallet
         numberOfAccess: 1000,
@@ -462,8 +459,8 @@ describe('web3telegram.sendTelegram()', () => {
           expect(sendTelegramResponse.taskId).toBeDefined();
         },
         2 * MAX_EXPECTED_BLOCKTIME +
-          MAX_EXPECTED_WEB2_SERVICES_TIME +
-          MAX_EXPECTED_SUBGRAPH_INDEXING_TIME
+        MAX_EXPECTED_WEB2_SERVICES_TIME +
+        MAX_EXPECTED_SUBGRAPH_INDEXING_TIME
       );
     });
 
@@ -519,8 +516,8 @@ describe('web3telegram.sendTelegram()', () => {
             );
           },
           2 * MAX_EXPECTED_BLOCKTIME +
-            MAX_EXPECTED_WEB2_SERVICES_TIME +
-            MAX_EXPECTED_SUBGRAPH_INDEXING_TIME
+          MAX_EXPECTED_WEB2_SERVICES_TIME +
+          MAX_EXPECTED_SUBGRAPH_INDEXING_TIME
         );
         it(
           'should create task if user approves the non sponsored amount',
@@ -570,8 +567,8 @@ describe('web3telegram.sendTelegram()', () => {
             expect(sendTelegramResponse.taskId).toBeDefined();
           },
           2 * MAX_EXPECTED_BLOCKTIME +
-            MAX_EXPECTED_WEB2_SERVICES_TIME +
-            MAX_EXPECTED_SUBGRAPH_INDEXING_TIME
+          MAX_EXPECTED_WEB2_SERVICES_TIME +
+          MAX_EXPECTED_SUBGRAPH_INDEXING_TIME
         );
       });
       describe('and workerpoolMaxPrice does NOT covers the non sponsored amount', () => {
@@ -623,8 +620,8 @@ describe('web3telegram.sendTelegram()', () => {
             );
           },
           2 * MAX_EXPECTED_BLOCKTIME +
-            MAX_EXPECTED_WEB2_SERVICES_TIME +
-            MAX_EXPECTED_SUBGRAPH_INDEXING_TIME
+          MAX_EXPECTED_WEB2_SERVICES_TIME +
+          MAX_EXPECTED_SUBGRAPH_INDEXING_TIME
         );
       });
     });
