Merge pull request #446 from multiversx/refactor-05-13

Minor refactoring: use "isTyped"
multiversx · May 27, 2024 · a62a324 · a62a324
2 parents ddea99b + 1d41828
commit a62a324
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/src/smartContractQueriesController.ts b/src/smartContractQueriesController.ts
@@ -2,6 +2,7 @@ import { Err } from "./errors";
 import { IContractQueryResponse } from "./interfaceOfNetwork";
 import { SmartContractQuery, SmartContractQueryResponse } from "./smartContractQuery";
 import { ArgSerializer, ContractFunction, EndpointDefinition, NativeSerializer, ResultsParser } from "./smartcontracts";
+import { isTyped } from "./smartcontracts/typesystem";
 
 interface IAbi {
     getEndpoint(name: string | ContractFunction): EndpointDefinition;
@@ -62,13 +63,7 @@ export class SmartContractQueriesController {
     }
 
     private areArgsOfTypedValue(args: any[]): boolean {
-        for (const arg of args) {
-            if (!arg.belongsToTypesystem) {
-                return false;
-            }
-        }
-
-        return true;
+        return args.every((arg) => isTyped(arg));
     }
 
     private areArgsBuffers(args: any[]): boolean {

diff --git a/src/smartcontracts/nativeSerializer.ts b/src/smartcontracts/nativeSerializer.ts
@@ -31,6 +31,7 @@ import {
     I64Value,
     I8Type,
     I8Value,
+    isTyped,
     List,
     ListType,
     NumericalType,
@@ -168,7 +169,7 @@ export namespace NativeSerializer {
     }
 
     function convertToTypedValue(value: any, type: Type, errorContext: ArgumentErrorContext): TypedValue {
-        if (value && value.belongsToTypesystem) {
+        if (value && isTyped(value)) {
             // Value is already typed, no need to convert it.
             return value;
         }

diff --git a/src/transactionsFactories/smartContractTransactionsFactory.ts b/src/transactionsFactories/smartContractTransactionsFactory.ts
@@ -5,6 +5,7 @@ import { IAddress } from "../interface";
 import { Logger } from "../logger";
 import { ArgSerializer, CodeMetadata, ContractFunction, EndpointDefinition } from "../smartcontracts";
 import { NativeSerializer } from "../smartcontracts/nativeSerializer";
+import { isTyped } from "../smartcontracts/typesystem";
 import { TokenComputer, TokenTransfer } from "../tokens";
 import { Transaction } from "../transaction";
 import { byteArrayToHex, utf8ToHex } from "../utils.codec";
@@ -236,12 +237,6 @@ export class SmartContractTransactionsFactory {
     }
 
     private areArgsOfTypedValue(args: any[]): boolean {
-        for (const arg of args) {
-            if (!arg.belongsToTypesystem) {
-                return false;
-            }
-        }
-
-        return true;
+        return args.every((arg) => isTyped(arg));
     }
 }