Remove interfaces on network

src/index.ts

@@ -16,7 +16,6 @@ export * from "./delegation";
 export * from "./entrypoints";
 export * from "./errors";
 export * from "./interface";
-export * from "./interfaceOfNetwork";
 export * from "./logger";
 export * from "./message";
 export * from "./networkParams";

src/interface.ts

@@ -26,3 +26,10 @@ export interface IPlainTransactionObject {
     guardianSignature?: string;
     relayerSignature?: string;
 }
+
+export interface INetworkConfig {
+    MinGasLimit: number;
+    GasPerDataByte: number;
+    GasPriceModifier: number;
+    ChainID: string;
+}

src/testutils/mockNetworkProvider.ts

@@ -2,7 +2,6 @@ import { Address } from "../address";
 import { AsyncTimer } from "../asyncTimer";
 import * as errors from "../errors";
 import { ErrMock } from "../errors";
-import { IAccountOnNetwork } from "../interfaceOfNetwork";
 import {
     AccountOnNetwork,
     DefinitionOfFungibleTokenOnNetwork,
@@ -123,7 +122,7 @@ export class MockNetworkProvider implements INetworkProvider {
         throw new Error("Method not implemented.");
     }
 
-    mockUpdateAccount(address: Address, mutate: (item: IAccountOnNetwork) => void) {
+    mockUpdateAccount(address: Address, mutate: (item: AccountOnNetwork) => void) {
         let account = this.accounts.get(address.toBech32());
         if (account) {
             mutate(account);

src/testutils/wallets.ts

@@ -2,7 +2,7 @@ import * as fs from "fs";
 import * as path from "path";
 import { Account } from "../accounts";
 import { Address } from "../address";
-import { IAccountOnNetwork } from "../interfaceOfNetwork";
+import { AccountOnNetwork } from "../networkProviders";
 import { getAxios } from "../utils";
 import { UserSecretKey, UserSigner } from "./../wallet";
 import { readTestFile } from "./files";
@@ -11,7 +11,7 @@ import { isOnBrowserTests } from "./utils";
 export const DummyMnemonicOf12Words = "matter trumpet twenty parade fame north lift sail valve salon foster cinnamon";
 
 interface IAccountFetcher {
-    getAccount(address: Address): Promise<IAccountOnNetwork>;
+    getAccount(address: Address): Promise<AccountOnNetwork>;
 }
 
 export async function loadAndSyncTestWallets(provider: IAccountFetcher): Promise<Record<string, TestWallet>> {

src/transaction.ts

@@ -1,8 +1,7 @@
 import { BigNumber } from "bignumber.js";
 import { Address } from "./address";
 import { TRANSACTION_MIN_GAS_PRICE, TRANSACTION_OPTIONS_DEFAULT, TRANSACTION_VERSION_DEFAULT } from "./constants";
-import { IPlainTransactionObject } from "./interface";
-import { INetworkConfig } from "./interfaceOfNetwork";
+import { INetworkConfig, IPlainTransactionObject } from "./interface";
 import { interpretSignatureAsBuffer } from "./signature";
 import { TransactionComputer } from "./transactionComputer";
 

src/transactionComputer.ts

@@ -6,7 +6,7 @@ import {
     TRANSACTION_OPTIONS_TX_HASH_SIGN,
 } from "./constants";
 import * as errors from "./errors";
-import { INetworkConfig } from "./interfaceOfNetwork";
+import { INetworkConfig } from "./interface";
 import { ProtoSerializer } from "./proto";
 import { Transaction } from "./transaction";
 

src/transactionWatcher.ts

@@ -7,12 +7,12 @@ import {
     ErrIsCompletedFieldIsMissingOnTransaction,
 } from "./errors";
 import { ITransactionFetcher } from "./interface";
-import { ITransactionStatus } from "./interfaceOfNetwork";
 import { Logger } from "./logger";
 import { TransactionEvent } from "./transactionEvents";
 import { TransactionOnNetwork } from "./transactionOnNetwork";
+import { TransactionStatus } from "./transactionStatus";
 
-export type PredicateIsAwaitedStatus = (status: ITransactionStatus) => boolean;
+export type PredicateIsAwaitedStatus = (status: TransactionStatus) => boolean;
 
 /**
  * Internal interface: a transaction, as seen from the perspective of a {@link TransactionWatcher}.
@@ -29,7 +29,7 @@ export class TransactionWatcher {
     static DefaultTimeout: number = TransactionWatcher.DefaultPollingInterval * 15;
     static DefaultPatience: number = 0;
 
-    static NoopOnStatusReceived = (_: ITransactionStatus) => {};
+    static NoopOnStatusReceived = (_: TransactionStatus) => {};
 
     protected readonly fetcher: ITransactionFetcher;
     protected readonly pollingIntervalMilliseconds: number;