[refactor] Merge OptionalABI with existing types

aptos-labs · Feb 12, 2024 · 9ff4837 · 9ff4837
1 parent caef3e3
commit 9ff4837
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/src/api/transactionSubmission/build.ts b/src/api/transactionSubmission/build.ts
@@ -8,7 +8,6 @@ import {
   InputGenerateTransactionOptions,
   SimpleTransaction,
   MultiAgentTransaction,
-  OptionalAbi,
 } from "../../transactions";
 import { AptosConfig } from "../aptosConfig";
 
@@ -32,14 +31,12 @@ export class Build {
    *
    * @returns SimpleTransaction
    */
-  async simple(
-    args: {
-      sender: AccountAddressInput;
-      data: InputGenerateTransactionPayloadData;
-      options?: InputGenerateTransactionOptions;
-      withFeePayer?: boolean;
-    } & OptionalAbi,
-  ): Promise<SimpleTransaction> {
+  async simple(args: {
+    sender: AccountAddressInput;
+    data: InputGenerateTransactionPayloadData;
+    options?: InputGenerateTransactionOptions;
+    withFeePayer?: boolean;
+  }): Promise<SimpleTransaction> {
     return generateTransaction({ aptosConfig: this.config, ...args });
   }
 

diff --git a/src/internal/transactionSubmission.ts b/src/internal/transactionSubmission.ts
@@ -34,7 +34,6 @@ import {
   InputGenerateSingleSignerRawTransactionData,
   MultiAgentTransaction,
   AnyTransactionPayloadInstance,
-  OptionalAbi,
   EntryFunctionABI,
 } from "../transactions/types";
 import { getInfo } from "./account";
@@ -48,10 +47,10 @@ import { TypeTagU8, TypeTagVector } from "../transactions";
  * Typescript can infer the return type based on the appropriate function overload.
  */
 export async function generateTransaction(
-  args: { aptosConfig: AptosConfig } & InputGenerateSingleSignerRawTransactionData & OptionalAbi,
+  args: { aptosConfig: AptosConfig } & InputGenerateSingleSignerRawTransactionData,
 ): Promise<SimpleTransaction>;
 export async function generateTransaction(
-  args: { aptosConfig: AptosConfig } & InputGenerateMultiAgentRawTransactionData & OptionalAbi,
+  args: { aptosConfig: AptosConfig } & InputGenerateMultiAgentRawTransactionData,
 ): Promise<MultiAgentTransaction>;
 /**
  * Generates any transaction by passing in the required arguments
@@ -94,14 +93,14 @@ export async function generateTransaction(
  * ```
  */
 export async function generateTransaction(
-  args: { aptosConfig: AptosConfig } & InputGenerateTransactionData & OptionalAbi,
+  args: { aptosConfig: AptosConfig } & InputGenerateTransactionData,
 ): Promise<AnyRawTransaction> {
   const payload = await buildTransactionPayload(args);
   return buildRawTransaction(args, payload);
 }
 
 export async function buildTransactionPayload(
-  args: { aptosConfig: AptosConfig } & InputGenerateTransactionData & OptionalAbi,
+  args: { aptosConfig: AptosConfig } & InputGenerateTransactionData,
 ): Promise<AnyTransactionPayloadInstance> {
   const { aptosConfig, data, abi } = args;
 
@@ -112,7 +111,7 @@ export async function buildTransactionPayload(
     // TODO: Add ABI checking later
     payload = await generateTransactionPayload(data);
   } else if ("multisigAddress" in data) {
-    if (abi !== undefined) {
+    if (abi) {
       payload = generateTransactionPayloadWithABI(data, abi);
     } else {
       generateTransactionPayloadData = {
@@ -124,7 +123,7 @@ export async function buildTransactionPayload(
       };
       payload = await generateTransactionPayload(generateTransactionPayloadData);
     }
-  } else if (abi !== undefined) {
+  } else if (abi) {
     payload = generateTransactionPayloadWithABI(data, abi);
   } else {
     generateTransactionPayloadData = {

diff --git a/src/transactions/types.ts b/src/transactions/types.ts
@@ -244,6 +244,7 @@ export interface InputGenerateSingleSignerRawTransactionData {
   options?: InputGenerateTransactionOptions;
   withFeePayer?: boolean;
   secondarySignerAddresses?: undefined;
+  abi?: EntryFunctionABI;
 }
 
 /**
@@ -255,9 +256,6 @@ export interface InputGenerateMultiAgentRawTransactionData {
   secondarySignerAddresses: AccountAddressInput[];
   options?: InputGenerateTransactionOptions;
   withFeePayer?: boolean;
-}
-
-export interface OptionalAbi {
   abi?: EntryFunctionABI;
 }