diff --git a/src/web3telegram/sendTelegram.ts b/src/web3telegram/sendTelegram.ts index bc4336d..7a1c3d8 100644 --- a/src/web3telegram/sendTelegram.ts +++ b/src/web3telegram/sendTelegram.ts @@ -279,7 +279,7 @@ export const sendTelegram = async ({ const requestorder = await iexec.order.signRequestorder(requestorderToSign); // Match orders and compute task ID - const { dealid } = await iexec.order.matchOrders( + const { dealid: dealId } = await iexec.order.matchOrders( { apporder: apporder, datasetorder: datasetorder, @@ -288,8 +288,9 @@ export const sendTelegram = async ({ }, { useVoucher: vUseVoucher } ); - const taskId = await iexec.deal.computeTaskId(dealid, 0); + const taskId = await iexec.deal.computeTaskId(dealId, 0); return { + dealId, taskId, }; } catch (error) { diff --git a/src/web3telegram/types.ts b/src/web3telegram/types.ts index f5c427c..92ca61b 100644 --- a/src/web3telegram/types.ts +++ b/src/web3telegram/types.ts @@ -65,6 +65,7 @@ export type SendTelegramParams = { export type SendTelegramResponse = { taskId: string; + dealId: string; }; export type PrepareTelegramCampaignParams = { diff --git a/tests/e2e/sendTelegram.test.ts b/tests/e2e/sendTelegram.test.ts index b8096c0..7001667 100644 --- a/tests/e2e/sendTelegram.test.ts +++ b/tests/e2e/sendTelegram.test.ts @@ -174,12 +174,10 @@ describe('web3telegram.sendTelegram()', () => { protectedData: validProtectedData.address, workerpoolMaxPrice: prodWorkerpoolPublicPrice, }); - expect('taskId' in sendTelegramResponse).toBe(true); - expect( - 'taskId' in sendTelegramResponse - ? sendTelegramResponse.taskId - : undefined - ).toBeDefined(); + expect(sendTelegramResponse).toStrictEqual({ + dealId: expect.any(String), + taskId: expect.any(String), + }); }, 2 * MAX_EXPECTED_BLOCKTIME + MAX_EXPECTED_WEB2_SERVICES_TIME ); @@ -290,12 +288,10 @@ describe('web3telegram.sendTelegram()', () => { protectedData: validProtectedData.address, workerpoolAddressOrEns: learnProdWorkerpoolAddress, }); - expect('taskId' in sendTelegramResponse).toBe(true); - expect( - 'taskId' in sendTelegramResponse - ? sendTelegramResponse.taskId - : undefined - ).toBeDefined(); + expect(sendTelegramResponse).toStrictEqual({ + dealId: expect.any(String), + taskId: expect.any(String), + }); }, 2 * MAX_EXPECTED_BLOCKTIME + MAX_EXPECTED_WEB2_SERVICES_TIME ); @@ -323,11 +319,10 @@ describe('web3telegram.sendTelegram()', () => { workerpoolAddressOrEns: learnProdWorkerpoolAddress, }); expect('taskId' in sendTelegramResponse).toBe(true); - expect( - 'taskId' in sendTelegramResponse - ? sendTelegramResponse.taskId - : undefined - ).toBeDefined(); + expect(sendTelegramResponse).toStrictEqual({ + dealId: expect.any(String), + taskId: expect.any(String), + }); }, 2 * MAX_EXPECTED_BLOCKTIME + MAX_EXPECTED_WEB2_SERVICES_TIME ); @@ -344,11 +339,10 @@ describe('web3telegram.sendTelegram()', () => { workerpoolAddressOrEns: learnProdWorkerpoolAddress, }); expect('taskId' in sendTelegramResponse).toBe(true); - expect( - 'taskId' in sendTelegramResponse - ? sendTelegramResponse.taskId - : undefined - ).toBeDefined(); + expect(sendTelegramResponse).toStrictEqual({ + dealId: expect.any(String), + taskId: expect.any(String), + }); }, 2 * MAX_EXPECTED_BLOCKTIME + MAX_EXPECTED_WEB2_SERVICES_TIME ); @@ -365,11 +359,10 @@ describe('web3telegram.sendTelegram()', () => { }); expect(sendTelegramResponse).toBeDefined(); expect('taskId' in sendTelegramResponse).toBe(true); - expect( - 'taskId' in sendTelegramResponse - ? sendTelegramResponse.taskId - : undefined - ).toBeDefined(); + expect(sendTelegramResponse).toStrictEqual({ + dealId: expect.any(String), + taskId: expect.any(String), + }); }, 2 * MAX_EXPECTED_BLOCKTIME + MAX_EXPECTED_WEB2_SERVICES_TIME ); @@ -387,12 +380,10 @@ describe('web3telegram.sendTelegram()', () => { senderName: 'Product Team', workerpoolAddressOrEns: learnProdWorkerpoolAddress, }); - expect('taskId' in sendTelegramResponse).toBe(true); - expect( - 'taskId' in sendTelegramResponse - ? sendTelegramResponse.taskId - : undefined - ).toBeDefined(); + expect(sendTelegramResponse).toStrictEqual({ + dealId: expect.any(String), + taskId: expect.any(String), + }); }, 2 * MAX_EXPECTED_BLOCKTIME + MAX_EXPECTED_WEB2_SERVICES_TIME ); @@ -406,12 +397,10 @@ describe('web3telegram.sendTelegram()', () => { workerpoolAddressOrEns: learnProdWorkerpoolAddress, label: 'ID1234678', }); - expect('taskId' in sendTelegramResponse).toBe(true); - expect( - 'taskId' in sendTelegramResponse - ? sendTelegramResponse.taskId - : undefined - ).toBeDefined(); + expect(sendTelegramResponse).toStrictEqual({ + dealId: expect.any(String), + taskId: expect.any(String), + }); // TODO check label in created deal }, 2 * MAX_EXPECTED_BLOCKTIME + MAX_EXPECTED_WEB2_SERVICES_TIME @@ -500,12 +489,10 @@ describe('web3telegram.sendTelegram()', () => { // workerpoolAddressOrEns: prodWorkerpoolAddress, // default useVoucher: true, }); - expect('taskId' in sendTelegramResponse).toBe(true); - expect( - 'taskId' in sendTelegramResponse - ? sendTelegramResponse.taskId - : undefined - ).toBeDefined(); + expect(sendTelegramResponse).toStrictEqual({ + dealId: expect.any(String), + taskId: expect.any(String), + }); }, 2 * MAX_EXPECTED_BLOCKTIME + MAX_EXPECTED_WEB2_SERVICES_TIME + @@ -561,12 +548,10 @@ describe('web3telegram.sendTelegram()', () => { workerpoolMaxPrice: nonSponsoredAmount, useVoucher: true, }); - expect('taskId' in sendTelegramResponse).toBe(true); - expect( - 'taskId' in sendTelegramResponse - ? sendTelegramResponse.taskId - : undefined - ).toBeDefined(); + expect(sendTelegramResponse).toStrictEqual({ + dealId: expect.any(String), + taskId: expect.any(String), + }); }, 2 * MAX_EXPECTED_BLOCKTIME + MAX_EXPECTED_WEB2_SERVICES_TIME +