fix: bad dealId naming (#531)

Author: PierreJeanjacquot

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

@@ -373,26 +373,26 @@ export const processProtectedData = async <
       ...(vVoucherOwner ? { voucherAddress: userVoucher?.address } : {}),
     };
 
-    const { dealid, txHash } = await iexec.order.matchOrders(
+    const { dealid: dealId, txHash } = await iexec.order.matchOrders(
       orders,
       matchOptions
     );
-    const taskId = await iexec.deal.computeTaskId(dealid, 0);
+    const taskId = await iexec.deal.computeTaskId(dealId, 0);
 
     vOnStatusUpdate({
       title: 'REQUEST_TO_PROCESS_PROTECTED_DATA',
       isDone: true,
       payload: {
-        txHash: txHash,
-        dealId: dealid,
-        taskId: taskId,
+        txHash,
+        dealId,
+        taskId,
       },
     });
 
     if (vWaitForResult === false) {
       return {
-        txHash: txHash,
-        dealId: dealid,
+        txHash,
+        dealId,
         taskId,
         ...(privateKey ? { pemPrivateKey: privateKey } : {}),
       } as ProcessProtectedDataResponse<Params>;
@@ -408,15 +408,15 @@ export const processProtectedData = async <
 
     await waitForTaskCompletion({
       iexec,
-      dealid,
+      dealId,
       taskId,
     });
 
     vOnStatusUpdate({
       title: 'CONSUME_TASK',
       isDone: true,
       payload: {
-        taskId: taskId,
+        taskId,
       },
     });
 
@@ -429,8 +429,8 @@ export const processProtectedData = async <
     });
 
     return {
-      txHash: txHash,
-      dealId: dealid,
+      txHash,
+      dealId,
       taskId,
       result,
       ...(privateKey ? { pemPrivateKey: privateKey } : {}),

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

@@ -14,7 +14,7 @@ import { IExecConsumer } from '../types/internalTypes.js';
 
 export const waitForTaskCompletion = async ({
   iexec = throwIfMissing(),
-  dealid,
+  dealId,
   taskId,
   onStatusUpdate = () => {},
 }: IExecConsumer &
@@ -26,7 +26,7 @@ export const waitForTaskCompletion = async ({
   const vDealId = taskIdSchema()
     .required()
     .label('dealId')
-    .validateSync(dealid);
+    .validateSync(dealId);
   const vOnStatusUpdate =
     validateOnStatusUpdateCallback<
       OnStatusUpdateFn<WaitForTaskCompletionStatuses>

packages/sdk/src/lib/types/coreTypes.ts

@@ -214,7 +214,7 @@ export type WaitForTaskCompletionStatuses = 'TASK_UPDATED';
 
 export type WaitForTaskCompletionParams = {
   taskId: string;
-  dealid: string;
+  dealId: string;
   onStatusUpdate?: OnStatusUpdateFn<WaitForTaskCompletionStatuses>;
 };
 

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

@@ -20,7 +20,7 @@ describe('dataProtectorCore.waitForTaskCompletion()', () => {
     const COMPLETED_DEALID =
       '0xb5091be0385c80545cdd12e7c678b96dbb6338cf699324f8f2aa94d3f33f6eda';
     const res = await dataProtectorCore.waitForTaskCompletion({
-      dealid: COMPLETED_DEALID,
+      dealId: COMPLETED_DEALID,
       taskId: COMPLETED_TASKID,
       onStatusUpdate,
     });
@@ -43,7 +43,7 @@ describe('dataProtectorCore.waitForTaskCompletion()', () => {
       '0xd613b7c6c4a022efe129fd93ce547eba71fc1055e0b42d20b11ad1f3505ad0a5';
     const onStatusUpdate = jest.fn();
     const res = await dataProtectorCore.waitForTaskCompletion({
-      dealid: FAILED_DEALID,
+      dealId: FAILED_DEALID,
       taskId: FAILED_TASKID,
       onStatusUpdate,
     });
@@ -66,7 +66,7 @@ describe('dataProtectorCore.waitForTaskCompletion()', () => {
       '0xab15a51de7a3829fca1d3666b81b53e9e9ced0aa71bf20e7ebee1be1bdb3ee33';
     const onStatusUpdate = jest.fn();
     const res = await dataProtectorCore.waitForTaskCompletion({
-      dealid: TIMEOUT_DEALID,
+      dealId: TIMEOUT_DEALID,
       taskId: TIMEOUT_TASKID,
       onStatusUpdate,
     });