fix: remove deprecated methods calls (#524)

Author: PierreJeanjacquot

packages/sdk/src/lib/dataProtectorCore/getGrantedAccess.ts

@@ -40,17 +40,15 @@ export const getGrantedAccess = async ({
     .validateSync(pageSize);
 
   try {
-    const { count, orders } = await iexec.orderbook.fetchDatasetOrderbook(
-      vProtectedData || 'any',
-      {
-        app: vAuthorizedApp || 'any',
-        requester: vAuthorizedUser || 'any',
-        isRequesterStrict: vIsUserStrict,
-        isAppStrict: true,
-        page: vPage,
-        pageSize: vPageSize,
-      }
-    );
+    const { count, orders } = await iexec.orderbook.fetchDatasetOrderbook({
+      dataset: vProtectedData || 'any',
+      app: vAuthorizedApp || 'any',
+      requester: vAuthorizedUser || 'any',
+      isRequesterStrict: vIsUserStrict,
+      isAppStrict: true,
+      page: vPage,
+      pageSize: vPageSize,
+    });
     const grantedAccess = orders?.map((order) =>
       formatGrantedAccess(order.order, order.remaining)
     );

packages/sdk/src/lib/dataProtectorCore/processProtectedData.ts

@@ -175,7 +175,8 @@ export const processProtectedData = async ({
     ] = await Promise.all([
       // Fetch dataset order
       iexec.orderbook
-        .fetchDatasetOrderbook(vProtectedData, {
+        .fetchDatasetOrderbook({
+          dataset: vProtectedData,
           app: vApp,
           requester: requester,
         })
@@ -187,7 +188,8 @@ export const processProtectedData = async ({
         }),
       // Fetch dataset order for whitelist
       iexec.orderbook
-        .fetchDatasetOrderbook(vProtectedData, {
+        .fetchDatasetOrderbook({
+          dataset: vProtectedData,
           app: vUserWhitelist,
           requester: requester,
         })
@@ -199,7 +201,8 @@ export const processProtectedData = async ({
         }),
       // Fetch app order
       iexec.orderbook
-        .fetchAppOrderbook(vApp, {
+        .fetchAppOrderbook({
+          app: vApp,
           minTag: ['tee', 'scone'],
           maxTag: ['tee', 'scone'],
           workerpool: vWorkerpool,

packages/sdk/tests/e2e/dataProtectorCore/getGrantedAccess.test.ts

@@ -22,19 +22,18 @@ async function consumeProtectedDataOrder(
   secrets: Record<number, string>,
   args: string
 ) {
-  const datasetOrderbook = await iexec.orderbook.fetchDatasetOrderbook(
-    protectedData,
-    {
-      app: app,
-      requester: await iexec.wallet.getAddress(),
-    }
-  );
+  const datasetOrderbook = await iexec.orderbook.fetchDatasetOrderbook({
+    dataset: protectedData,
+    app: app,
+    requester: await iexec.wallet.getAddress(),
+  });
   const datasetOrder = datasetOrderbook.orders[0]?.order;
   if (!datasetOrder) {
     throw new Error('No dataset order found');
   }
 
-  const appOrderbook = await iexec.orderbook.fetchAppOrderbook(app, {
+  const appOrderbook = await iexec.orderbook.fetchAppOrderbook({
+    app: app,
     minTag: ['tee', 'scone'],
     maxTag: ['tee', 'scone'],
     workerpool: workerpool,

packages/sdk/tests/unit/dataProtectorCore/getGrantedAccess.test.ts

@@ -117,18 +117,15 @@ describe('getGrantedAccess', () => {
         });
 
         // --- THEN
-        expect(fetchDatasetOrderbookSpy).toHaveBeenNthCalledWith(
-          1,
-          '0x35396912db97ff130411301ec722fc92ac37b00d',
-          {
-            app: '0x7a8f4c23ef61dd295b683409fe15ad76bc92c14e',
-            requester: '0x1e4b7a56c8d9ab34f0126789bcde3456f7890abc',
-            page: 1,
-            pageSize: 10,
-            isRequesterStrict: true,
-            isAppStrict: true,
-          }
-        );
+        expect(fetchDatasetOrderbookSpy).toHaveBeenNthCalledWith(1, {
+          dataset: '0x35396912db97ff130411301ec722fc92ac37b00d',
+          app: '0x7a8f4c23ef61dd295b683409fe15ad76bc92c14e',
+          requester: '0x1e4b7a56c8d9ab34f0126789bcde3456f7890abc',
+          page: 1,
+          pageSize: 10,
+          isRequesterStrict: true,
+          isAppStrict: true,
+        });
       });
     });
   });
@@ -237,7 +234,8 @@ describe('getGrantedAccess', () => {
       const grantedAccessResult = await getGrantedAccess({ iexec });
 
       // --- THEN
-      expect(fetchDatasetOrderbookSpy).toHaveBeenNthCalledWith(1, 'any', {
+      expect(fetchDatasetOrderbookSpy).toHaveBeenNthCalledWith(1, {
+        dataset: 'any',
         app: 'any',
         requester: 'any',
         page: undefined,

packages/sdk/tests/unit/dataProtectorCore/processProtectedData/processProtectedData.test.ts

@@ -565,8 +565,8 @@ describe('processProtectedData', () => {
       expect(calls).toEqual(
         expect.arrayContaining([
           [
-            expect.any(String),
             expect.objectContaining({
+              dataset: expect.any(String),
               app: expect.any(String),
               requester: validWhitelistAddress.toLowerCase(),
             }),