Merge pull request #159 from ElrondNetwork/better-interactions

Breaking changes (erdjs 10): improve contract interactions and interpretation of contract results
multiversx · Mar 24, 2022 · be7ba70 · be7ba70
2 parents 790a352 + 41084c6
commit be7ba70
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 30 deletions.
diff --git a/src-network-providers/networkProvider/contractResults.ts b/src-network-providers/networkProvider/contractResults.ts
@@ -5,7 +5,7 @@ import { Hash } from "../hash";
 import { IContractQueryResponse, IContractResultItem, IContractResults } from "./interface";
 import { GasLimit, GasPrice } from "../networkParams";
 import { Nonce } from "../nonce";
-import { ArgSerializer, EndpointDefinition, MaxUint64, ReturnCode, TypedValue } from "../smartcontracts";
+import { MaxUint64, ReturnCode } from "../smartcontracts";
 import { TransactionHash } from "../transaction";
 
 export class ContractResults implements IContractResults {
@@ -80,16 +80,6 @@ export class ContractResultItem implements IContractResultItem {
 
         return item;
     }
-
-    getOutputUntyped(): Buffer[] {
-        // TODO: Decide how to parse "data" (immediate results vs. other results).
-        throw new Error("Method not implemented.");
-    }
-
-    getOutputTyped(_endpointDefinition: EndpointDefinition): TypedValue[] {
-        // TODO: Decide how to parse "data" (immediate results vs. other results).
-        throw new Error("Method not implemented.");
-    }
 }
 
 export class ContractQueryResponse implements IContractQueryResponse {
@@ -110,14 +100,7 @@ export class ContractQueryResponse implements IContractQueryResponse {
         return response;
     }
 
-    getOutputUntyped(): Buffer[] {
-        let buffers = this.returnData.map((item) => Buffer.from(item || "", "base64"));
-        return buffers;
-    }
-
-    getOutputTyped(endpointDefinition: EndpointDefinition): TypedValue[] {
-        let buffers = this.getOutputUntyped();
-        let values = new ArgSerializer().buffersToValues(buffers, endpointDefinition!.output);
-        return values;
+    getReturnDataParts(): Buffer[] {
+        return this.returnData.map((item) => Buffer.from(item || ""));
     }
 }
diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
@@ -9,7 +9,7 @@ import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
 import { Nonce } from "../nonce";
 import { Signature } from "../signature";
-import { EndpointDefinition, Query, ReturnCode, TypedValue } from "../smartcontracts";
+import { Query, ReturnCode } from "../smartcontracts";
 import { Stats } from "../stats";
 import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
 import { TransactionLogs } from "../transactionLogs";
@@ -204,19 +204,15 @@ export interface IContractResultItem {
     gasPrice: GasPrice;
     callType: number;
     returnMessage: string;
-
-    getOutputUntyped(): Buffer[];
-    getOutputTyped(endpointDefinition: EndpointDefinition): TypedValue[];
 }
 
 export interface IContractQueryResponse {
     returnData: string[];
     returnCode: ReturnCode;
     returnMessage: string;
     gasUsed: GasLimit;
-
-    getOutputUntyped(): Buffer[];
-    getOutputTyped(endpointDefinition: EndpointDefinition): TypedValue[];
+
+    getReturnDataParts(): Buffer[];
 }
 
 export interface IContractSimulation {

diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -227,7 +227,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         let proxyResponse = await proxyProvider.queryContract(query);
 
         assert.deepEqual(apiResponse, proxyResponse);
-        assert.deepEqual(apiResponse.getOutputUntyped(), proxyResponse.getOutputUntyped());
+        assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
 
         // Query: increment counter
         query = new Query({
@@ -240,7 +240,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         proxyResponse = await proxyProvider.queryContract(query);
 
         assert.deepEqual(apiResponse, proxyResponse);
-        assert.deepEqual(apiResponse.getOutputUntyped(), proxyResponse.getOutputUntyped());
+        assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
 
         // Query: issue ESDT
         query = new Query({
@@ -260,6 +260,6 @@ describe("test network providers on devnet: Proxy and API", function () {
         proxyResponse = await proxyProvider.queryContract(query);
 
         assert.deepEqual(apiResponse, proxyResponse);
-        assert.deepEqual(apiResponse.getOutputUntyped(), proxyResponse.getOutputUntyped());
+        assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
     });
 });