Revert "fix addToCollection function"

This reverts commit e500882.
iExecBlockchainComputing · May 3, 2024 · d19d2ef · d19d2ef
1 parent 00fb960
commit d19d2ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 57 deletions.
diff --git a/packages/sdk/src/lib/dataProtectorSharing/addToCollection.ts b/packages/sdk/src/lib/dataProtectorSharing/addToCollection.ts
@@ -82,16 +82,13 @@ export const addToCollection = async ({
     protectedData: vProtectedData,
     sharingContractAddress,
   });
-
-  if (!approveTx) {
-    vOnStatusUpdate({
-      title: 'APPROVE_COLLECTION_CONTRACT',
-      isDone: true,
-      payload: {
-        approveTxHash: approveTx?.hash,
-      },
-    });
-  }
+  vOnStatusUpdate({
+    title: 'APPROVE_COLLECTION_CONTRACT',
+    isDone: true,
+    payload: {
+      approveTxHash: approveTx.hash,
+    },
+  });
 
   try {
     vOnStatusUpdate({

diff --git a/packages/sdk/tests/e2e/dataProtectorSharing/addToCollection.test.ts b/packages/sdk/tests/e2e/dataProtectorSharing/addToCollection.test.ts
@@ -2,9 +2,6 @@ import { beforeAll, describe, expect, it, jest } from '@jest/globals';
 import { Wallet, type HDNodeWallet } from 'ethers';
 import { IExecDataProtector } from '../../../src/index.js';
 import { getTestConfig, timeouts } from '../../test-utils.js';
-import { approveCollectionContract } from '../../../src/lib/dataProtectorSharing/smartContract/approveCollectionContract.js';
-import { IExec } from 'iexec';
-import { DEFAULT_SHARING_CONTRACT_ADDRESS } from '../../../src/config/config.js';
 
 describe('dataProtector.addToCollection()', () => {
   let dataProtector: IExecDataProtector;
@@ -53,50 +50,6 @@ describe('dataProtector.addToCollection()', () => {
         timeouts.createCollection +
         timeouts.addToCollection
     );
-
-    it.only(
-      'should work, if the protectedData has already been approved to the ProtectedDataSharing Contract',
-      async () => {
-        // --- GIVEN
-        const { address: protectedData } = await dataProtector.core.protectData(
-          {
-            data: { doNotUse: 'test' },
-            name: 'test addToCollection',
-          }
-        );
-
-        const { collectionId } = await dataProtector.sharing.createCollection();
-
-        const onStatusUpdateMock = jest.fn();
-        const [ethProvider, options] = getTestConfig(wallet.privateKey);
-        const iexec = new IExec(
-          { ethProvider },
-          { ipfsGatewayURL: options.ipfsGateway, ...options?.iexecOptions }
-        );
-        await approveCollectionContract({
-          iexec,
-          protectedData,
-          sharingContractAddress: DEFAULT_SHARING_CONTRACT_ADDRESS,
-        });
-
-        // --- WHEN
-        await dataProtector.sharing.addToCollection({
-          collectionId,
-          addOnlyAppWhitelist,
-          protectedData,
-          onStatusUpdate: onStatusUpdateMock,
-        });
-
-        // --- THEN
-        expect(onStatusUpdateMock).toHaveBeenCalledWith({
-          title: 'ADD_PROTECTED_DATA_TO_COLLECTION',
-          isDone: true,
-        });
-      },
-      timeouts.protectData +
-        timeouts.createCollection +
-        timeouts.addToCollection
-    );
   });
 
   describe('When the given protected data does NOT exist', () => {