Added networkCurrency resolver for e2e tests (#529)

* Fixed #523
- Added networkCurrency resolver for e2e tests

* trigger travis

Author: rg911

e2e/infrastructure/AccountHttp.spec.ts

@@ -24,7 +24,6 @@ import { Account } from '../../src/model/account/Account';
 import { Address } from '../../src/model/account/Address';
 import { PublicAccount } from '../../src/model/account/PublicAccount';
 import { PlainMessage } from '../../src/model/message/PlainMessage';
-import { NetworkCurrencyLocal } from '../../src/model/mosaic/NetworkCurrencyLocal';
 import { AliasAction } from '../../src/model/namespace/AliasAction';
 import { NamespaceId } from '../../src/model/namespace/NamespaceId';
 import { NetworkType } from '../../src/model/network/NetworkType';
@@ -93,7 +92,7 @@ describe('AccountHttp', () => {
             const transferTransaction = TransferTransaction.create(
                 Deadline.create(),
                 account2.address,
-                [NetworkCurrencyLocal.createAbsolute(1)],
+                [helper.createNetworkCurrency(1, false)],
                 PlainMessage.create('test-message'),
                 networkType,
                 helper.maxFee,

e2e/infrastructure/BlockHttp.spec.ts

@@ -16,13 +16,11 @@
 
 import { expect } from 'chai';
 import { mergeMap } from 'rxjs/operators';
-import { BlockHttp } from '../../src/infrastructure/BlockHttp';
 import { BlockRepository } from '../../src/infrastructure/BlockRepository';
 import { QueryParams } from '../../src/infrastructure/QueryParams';
 import { ReceiptRepository } from '../../src/infrastructure/ReceiptRepository';
 import { Account } from '../../src/model/account/Account';
 import { PlainMessage } from '../../src/model/message/PlainMessage';
-import { NetworkCurrencyLocal } from '../../src/model/mosaic/NetworkCurrencyLocal';
 import { NetworkType } from '../../src/model/network/NetworkType';
 import { Deadline } from '../../src/model/transaction/Deadline';
 import { TransactionInfo } from '../../src/model/transaction/TransactionInfo';
@@ -73,7 +71,7 @@ describe('BlockHttp', () => {
             const transferTransaction = TransferTransaction.create(
                 Deadline.create(),
                 account2.address,
-                [NetworkCurrencyLocal.createAbsolute(1)],
+                [helper.createNetworkCurrency(1, false)],
                 PlainMessage.create('test-message'),
                 networkType,
                 helper.maxFee,

e2e/infrastructure/IntegrationTestHelper.ts

@@ -24,6 +24,10 @@ import { SignedTransaction } from '../../src/model/transaction/SignedTransaction
 import { Transaction } from '../../src/model/transaction/Transaction';
 import { UInt64 } from '../../src/model/UInt64';
 import { TransactionService } from '../../src/service/TransactionService';
+import { NetworkHarvestLocal } from '../../src/model/mosaic/NetworkHarvestLocal';
+import { NetworkCurrencyPublic } from '../../src/model/mosaic/NetworkCurrencyPublic';
+import { NetworkCurrencyLocal } from '../../src/model/mosaic/NetworkCurrencyLocal';
+import { NamespaceId } from '../../src/model/namespace/NamespaceId';
 
 export class IntegrationTestHelper {
     public readonly yaml = require('js-yaml');
@@ -43,6 +47,8 @@ export class IntegrationTestHelper {
     public maxFee: UInt64;
     public harvestingAccount: Account;
     public transactionService: TransactionService;
+    public networkCurrencyNamespaceId: NamespaceId;
+    public networkCurrencyDivisibility: number;
 
     start(): Promise<IntegrationTestHelper> {
         return new Promise<IntegrationTestHelper>(
@@ -77,6 +83,12 @@ export class IntegrationTestHelper {
                         // What would be the best maxFee? In the future we will load the fee multiplier from rest.
                         this.maxFee = UInt64.fromUint(1000000);
 
+                        // network Currency
+                        this.networkCurrencyNamespaceId = this.apiUrl.toLowerCase().includes('localhost') ?
+                            NetworkCurrencyLocal.NAMESPACE_ID : NetworkCurrencyPublic.NAMESPACE_ID;
+                        this.networkCurrencyDivisibility = this.apiUrl.toLowerCase().includes('localhost') ?
+                            NetworkCurrencyLocal.DIVISIBILITY : NetworkCurrencyPublic.DIVISIBILITY;
+
                         const bootstrapRoot = process.env.CATAPULT_SERVICE_BOOTSTRAP || path.resolve(__dirname, '../../../../catapult-service-bootstrap');
                         const bootstrapPath = `${bootstrapRoot}/build/generated-addresses/addresses.yaml`;
                         require('fs').readFile(bootstrapPath, (error: any, yamlData: any) => {
@@ -110,6 +122,13 @@ export class IntegrationTestHelper {
         return Account.createFromPrivateKey(data.privateKey ? data.privateKey : data.private, this.networkType);
     }
 
+    createNetworkCurrency(amount: number, isRelative: boolean = true): NetworkCurrencyPublic | NetworkCurrencyLocal {
+        if (this.apiUrl.toLowerCase().includes('localhost')) {
+            return isRelative ? NetworkCurrencyLocal.createRelative(amount) : NetworkCurrencyLocal.createAbsolute(amount);
+        }
+        return isRelative ? NetworkCurrencyPublic.createRelative(amount) : NetworkCurrencyPublic.createAbsolute(amount);
+    }
+
     announce(signedTransaction: SignedTransaction): Promise<Transaction> {
         console.log(`Announcing transaction: ${signedTransaction.type}`);
         return this.transactionService.announce(signedTransaction, this.listener).pipe(map((t) => {

e2e/infrastructure/Listener.spec.ts

@@ -23,7 +23,6 @@ import { Account } from '../../src/model/account/Account';
 import { PlainMessage } from '../../src/model/message/PlainMessage';
 import { Address, CosignatureTransaction, LockFundsTransaction, Mosaic, SignedTransaction, UInt64 } from '../../src/model/model';
 import { MosaicId } from '../../src/model/mosaic/MosaicId';
-import { NetworkCurrencyLocal } from '../../src/model/mosaic/NetworkCurrencyLocal';
 import { NamespaceId } from '../../src/model/namespace/NamespaceId';
 import { NetworkType } from '../../src/model/network/NetworkType';
 import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction';
@@ -45,7 +44,7 @@ describe('Listener', () => {
     let namespaceRepository: NamespaceRepository;
     let generationHash: string;
     let networkType: NetworkType;
-    const NetworkCurrencyLocalId: NamespaceId = NetworkCurrencyLocal.NAMESPACE_ID;
+    const NetworkCurrencyLocalId: NamespaceId = helper.networkCurrencyNamespaceId;
     let transactionRepository: TransactionRepository;
 
     before(() => {
@@ -100,7 +99,7 @@ describe('Listener', () => {
                                                   mosaicId: MosaicId | NamespaceId) => {
         const lockFundsTransaction = LockFundsTransaction.create(
             Deadline.create(),
-            new Mosaic(mosaicId, UInt64.fromUint(10 * Math.pow(10, NetworkCurrencyLocal.DIVISIBILITY))),
+            new Mosaic(mosaicId, UInt64.fromUint(10 * Math.pow(10, helper.networkCurrencyDivisibility))),
             UInt64.fromUint(1000),
             signedAggregatedTransaction,
             networkType, helper.maxFee,
@@ -180,7 +179,7 @@ describe('Listener', () => {
             const transferTransaction = TransferTransaction.create(
                 Deadline.create(),
                 cosignAccount1.address,
-                [new Mosaic(NetworkCurrencyLocalId, UInt64.fromUint(10 * Math.pow(10, NetworkCurrencyLocal.DIVISIBILITY)))],
+                [new Mosaic(NetworkCurrencyLocalId, UInt64.fromUint(10 * Math.pow(10, helper.networkCurrencyDivisibility)))],
                 PlainMessage.create('test-message'),
                 networkType, helper.maxFee,
             );
@@ -341,7 +340,7 @@ describe('Listener', () => {
     describe('Transactions Status', () => {
 
         it('transactionStatusGiven', () => {
-            const mosaics = [NetworkCurrencyLocal.createRelative(1000000000000)];
+            const mosaics = [helper.createNetworkCurrency(1000000000000)];
             const transferTransaction = TransferTransaction.create(
                 Deadline.create(),
                 account2.address,

e2e/infrastructure/NamespaceHttp.spec.ts

@@ -18,7 +18,6 @@ import { expect } from 'chai';
 import { NamespaceRepository } from '../../src/infrastructure/NamespaceRepository';
 import { Account } from '../../src/model/account/Account';
 import { Address } from '../../src/model/account/Address';
-import { NetworkCurrencyLocal } from '../../src/model/mosaic/NetworkCurrencyLocal';
 import { AliasAction } from '../../src/model/namespace/AliasAction';
 import { NamespaceId } from '../../src/model/namespace/NamespaceId';
 import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction';
@@ -28,7 +27,7 @@ import { UInt64 } from '../../src/model/UInt64';
 import { IntegrationTestHelper } from './IntegrationTestHelper';
 
 describe('NamespaceHttp', () => {
-    const defaultNamespaceId = NetworkCurrencyLocal.NAMESPACE_ID;
+    let defaultNamespaceId: NamespaceId;
     let namespaceId: NamespaceId;
     let namespaceRepository: NamespaceRepository;
     let account: Account;
@@ -40,6 +39,7 @@ describe('NamespaceHttp', () => {
             account = helper.account;
             generationHash = helper.generationHash;
             namespaceRepository = helper.repositoryFactory.createNamespaceRepository();
+            defaultNamespaceId = helper.networkCurrencyNamespaceId;
         });
     });