Merge pull request #8 from ElrondNetwork/fixes-upon-extraction

Fix DTOs.
multiversx · Apr 11, 2022 · cccfe8e · cccfe8e
2 parents b99a17f + 4c2212e
commit cccfe8e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/src-network-providers/contractResults.ts b/src-network-providers/contractResults.ts
@@ -13,10 +13,6 @@ export class ContractResults {
         });
     }
 
-    static empty(): ContractResults {
-        return new ContractResults([]);
-    }
-
     static fromProxyHttpResponse(results: any[]): ContractResults {
         let items = results.map(item => ContractResultItem.fromProxyHttpResponse(item));
         return new ContractResults(items);
@@ -41,7 +37,7 @@ export class ContractResultItem {
     gasPrice: IGasPrice = 0;
     callType: number = 0;
     returnMessage: string = "";
-    logs: TransactionLogs = TransactionLogs.empty();
+    logs: TransactionLogs = new TransactionLogs();
 
     constructor(init?: Partial<ContractResultItem>) {
         Object.assign(this, init);

diff --git a/src-network-providers/transactionLogs.ts b/src-network-providers/transactionLogs.ts
@@ -4,22 +4,19 @@ import { Address } from "./primitives";
 import { TransactionEvent } from "./transactionEvents";
 
 export class TransactionLogs {
-    readonly address: IAddress;
-    readonly events: TransactionEvent[];
+    address: IAddress = new Address("");
+    events: TransactionEvent[] = [];
 
-    constructor(address: IAddress, events: TransactionEvent[]) {
-        this.address = address;
-        this.events = events;
-    }
-
-    static empty(): TransactionLogs {
-        return new TransactionLogs(new Address(""), []);
+    constructor(init?: Partial<TransactionLogs>) {
+        Object.assign(this, init);
     }
 
     static fromHttpResponse(logs: any): TransactionLogs {
-        let address = new Address(logs.address);
-        let events = (logs.events || []).map((event: any) => TransactionEvent.fromHttpResponse(event));
-        return new TransactionLogs(address, events);
+        let result = new TransactionLogs();
+        result.address = new Address(logs.address);
+        result.events = (logs.events || []).map((event: any) => TransactionEvent.fromHttpResponse(event));
+
+        return result;
     }
 
     findSingleOrNoneEvent(identifier: string, predicate?: (event: TransactionEvent) => boolean): TransactionEvent | undefined {

diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
@@ -28,8 +28,8 @@ export class TransactionOnNetwork {
     hyperblockHash: string = "";
 
     receipt: TransactionReceipt = new TransactionReceipt();
-    contractResults: ContractResults = ContractResults.empty();
-    logs: TransactionLogs = TransactionLogs.empty();
+    contractResults: ContractResults = new ContractResults([]);
+    logs: TransactionLogs = new TransactionLogs();
 
     constructor(init?: Partial<TransactionOnNetwork>) {
         Object.assign(this, init);