refactor: clean types

Author: PierreJeanjacquot

src/web3telegram/IExecWeb3telegram.ts

@@ -116,9 +116,7 @@ export class IExecWeb3telegram {
     });
   }
 
-  async sendTelegram(
-    args: SendTelegramParams & { protectedData: string }
-  ): Promise<SendTelegramResponse> {
+  async sendTelegram(args: SendTelegramParams): Promise<SendTelegramResponse> {
     await this.init();
     await isValidProvider(this.iexec);
     return sendTelegram({

src/web3telegram/sendTelegram.ts

@@ -18,7 +18,7 @@ import {
   senderNameSchema,
   booleanSchema,
 } from '../utils/validators.js';
-import { SendTelegramResponse } from './types.js';
+import { SendTelegramParams, SendTelegramResponse } from './types.js';
 import {
   checkUserVoucher,
   filterWorkerpoolOrders,
@@ -34,18 +34,6 @@ import {
 
 export type SendTelegram = typeof sendTelegram;
 
-type SendTelegramSingleParams = {
-  senderName?: string;
-  telegramContent: string;
-  label?: string;
-  workerpoolAddressOrEns?: string;
-  dataMaxPrice?: number;
-  appMaxPrice?: number;
-  workerpoolMaxPrice?: number;
-  protectedData: string;
-  useVoucher?: boolean;
-};
-
 export const sendTelegram = async ({
   graphQLClient = throwIfMissing(),
   iexec = throwIfMissing(),
@@ -68,7 +56,7 @@ export const sendTelegram = async ({
   DappWhitelistAddressConsumer &
   IpfsNodeConfigConsumer &
   IpfsGatewayConfigConsumer &
-  SendTelegramSingleParams): Promise<SendTelegramResponse> => {
+  SendTelegramParams): Promise<SendTelegramResponse> => {
   try {
     const vDatasetAddress = addressOrEnsSchema()
       .required()

src/web3telegram/types.ts

@@ -36,34 +36,6 @@ export type Contact = {
   grantedAccess: GrantedAccess;
 };
 
-type SendTelegramCommonParams = {
-  senderName?: string;
-  telegramContent: string;
-  label?: string;
-  workerpoolAddressOrEns?: AddressOrENS;
-  dataMaxPrice?: number;
-  appMaxPrice?: number;
-  workerpoolMaxPrice?: number;
-  useVoucher?: boolean;
-};
-
-export type SendTelegramParams =
-  | ({
-      /**
-       * protected data to process.
-       */
-      protectedData: Address;
-    } & SendTelegramCommonParams)
-  | ({
-      /**
-       * Granted access to process in bulk.
-       * use `fetchMyContacts({ bulkOnly: true })` to get granted accesses.
-       * if not provided, the single message will be processed.
-       */
-      grantedAccess: GrantedAccess[];
-      maxProtectedDataPerTask?: number;
-    } & SendTelegramCommonParams);
-
 export type FetchMyContactsParams = {
   /**
    * Get contacts for this specific user only
@@ -79,27 +51,22 @@ export type FetchUserContactsParams = {
   userAddress: Address;
 } & FetchMyContactsParams;
 
-type SendTelegramSingleResponse = {
-  taskId: string;
+export type SendTelegramParams = {
+  senderName?: string;
+  telegramContent: string;
+  protectedData: Address;
+  label?: string;
+  workerpoolAddressOrEns?: AddressOrENS;
+  dataMaxPrice?: number;
+  appMaxPrice?: number;
+  workerpoolMaxPrice?: number;
+  useVoucher?: boolean;
 };
 
-type SendTelegramBulkResponse = {
-  tasks: {
-    bulkIndex: number;
-    taskId: string;
-    dealId: string;
-  }[];
+export type SendTelegramResponse = {
+  taskId: string;
 };
 
-export type SendTelegramResponse<Params = { protectedData: Address }> =
-  Params extends {
-    grantedAccess: GrantedAccess[];
-  }
-    ? SendTelegramBulkResponse
-    : never & Params extends { protectedData: Address }
-    ? SendTelegramSingleResponse
-    : never;
-
 export type PrepareTelegramCampaignParams = {
   /**
    * Granted access to process in bulk.
@@ -121,6 +88,11 @@ export type PrepareTelegramCampaignResponse = {
   campaignRequest: BulkRequest;
 };
 
+export type SendTelegramCampaignParams = {
+  campaignRequest: BulkRequest;
+  workerpoolAddressOrEns?: string;
+};
+
 export type SendTelegramCampaignResponse = {
   tasks: {
     bulkIndex: number;
@@ -129,11 +101,6 @@ export type SendTelegramCampaignResponse = {
   }[];
 };
 
-export type SendTelegramCampaignParams = {
-  campaignRequest: BulkRequest;
-  workerpoolAddressOrEns?: string;
-};
-
 /**
  * Configuration options for web3telegram.
  */