Merge pull request #189 from ElrondNetwork/ref-network-providers

Reference new network-providers in tests. Also adjust interface of TransactionOnNetwork

package.json

@@ -40,7 +40,7 @@
     "protobufjs": "6.10.2"
   },
   "devDependencies": {
-    "@elrondnetwork/erdjs-network-providers": "0.1.1",
+    "@elrondnetwork/erdjs-network-providers": "0.1.2",
     "@elrondnetwork/erdjs-walletcore": "1.0.0",
     "@types/assert": "1.4.6",
     "@types/chai": "4.2.11",

src/interfaceOfNetwork.ts

@@ -13,6 +13,8 @@ export interface INetworkConfig {
 }
 
 export interface ITransactionOnNetwork {
+    isCompleted: boolean;
+
     hash: IHash;
     type: string;
     value: ITransactionValue;
@@ -23,8 +25,6 @@ export interface ITransactionOnNetwork {
     receipt: ITransactionReceipt;
     contractResults: IContractResults;
     logs: ITransactionLogs;
-
-    isCompleted(): boolean;
 }
 
 export interface ITransactionStatus {

src/testutils/mockProvider.ts

@@ -71,7 +71,7 @@ export class MockProvider {
         let response = new TransactionOnNetwork({
             status: new TransactionStatus("executed"),
             contractResults: new ContractResults([contractResult]),
-            isCompleted: () => true
+            isCompleted: true
         });
 
         this.getTransactionResponders.unshift(new GetTransactionResponder(predicate, response));
@@ -105,7 +105,7 @@ export class MockProvider {
                 });
             } else if (point instanceof MarkCompleted) {
                 this.mockUpdateTransaction(hash, (transaction) => {
-                    transaction.isCompleted = () => true;
+                    transaction.isCompleted = true;
                 });
             } else if (point instanceof Wait) {
                 await timeline.start(point.milliseconds);

src/transactionWatcher.ts

@@ -62,7 +62,7 @@ export class TransactionWatcher {
       * Waits until the transaction is completely processed.
       */
     public async awaitCompleted(transaction: ITransaction): Promise<ITransactionOnNetwork> {
-        let isCompleted = (transactionOnNetwork: ITransactionOnNetwork) => transactionOnNetwork.isCompleted();
+        let isCompleted = (transactionOnNetwork: ITransactionOnNetwork) => transactionOnNetwork.isCompleted;
         let doFetch = async () => await this.fetcher.getTransaction(transaction.getHash(), undefined, true);
         let errorProvider = () => new ErrExpectedTransactionStatusNotReached();