Skip to content

Commit 5ea217d

Browse files
rg911rg911
authored
Merge branch 'master' into task/g455_namespace_max_depth
2 parents cf3939e + 41d6c77 commit 5ea217d

File tree

147 files changed

+1784
-916
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+1784
-916
lines changed

‎e2e/infrastructure/AccountHttp.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import { QueryParams } from '../../src/infrastructure/QueryParams';
2323
import { Account } from '../../src/model/account/Account';
2424
import { Address } from '../../src/model/account/Address';
2525
import { PublicAccount } from '../../src/model/account/PublicAccount';
26-
import { NetworkType } from '../../src/model/blockchain/NetworkType';
2726
import { PlainMessage } from '../../src/model/message/PlainMessage';
2827
import { NetworkCurrencyLocal } from '../../src/model/mosaic/NetworkCurrencyLocal';
2928
import { AliasAction } from '../../src/model/namespace/AliasAction';
3029
import { NamespaceId } from '../../src/model/namespace/NamespaceId';
30+
import { NetworkType } from '../../src/model/network/NetworkType';
3131
import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction';
3232
import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction';
3333
import { Deadline } from '../../src/model/transaction/Deadline';

‎e2e/infrastructure/BlockHttp.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import { BlockRepository } from '../../src/infrastructure/BlockRepository';
2121
import { QueryParams } from '../../src/infrastructure/QueryParams';
2222
import { ReceiptRepository } from '../../src/infrastructure/ReceiptRepository';
2323
import { Account } from '../../src/model/account/Account';
24-
import { NetworkType } from '../../src/model/blockchain/NetworkType';
2524
import { PlainMessage } from '../../src/model/message/PlainMessage';
2625
import { NetworkCurrencyLocal } from '../../src/model/mosaic/NetworkCurrencyLocal';
26+
import { NetworkType } from '../../src/model/network/NetworkType';
2727
import { Deadline } from '../../src/model/transaction/Deadline';
2828
import { TransactionInfo } from '../../src/model/transaction/TransactionInfo';
2929
import { TransferTransaction } from '../../src/model/transaction/TransferTransaction';

‎e2e/infrastructure/IntegrationTestHelper.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { IListener } from '../../src/infrastructure/IListener';
1919
import { RepositoryFactory } from '../../src/infrastructure/RepositoryFactory';
2020
import { RepositoryFactoryHttp } from '../../src/infrastructure/RepositoryFactoryHttp';
2121
import { Account } from '../../src/model/account/Account';
22-
import { NetworkType } from '../../src/model/blockchain/NetworkType';
22+
import { NetworkType } from '../../src/model/network/NetworkType';
2323
import { SignedTransaction } from '../../src/model/transaction/SignedTransaction';
2424
import { Transaction } from '../../src/model/transaction/Transaction';
2525
import { UInt64 } from '../../src/model/UInt64';
@@ -57,7 +57,8 @@ export class IntegrationTestHelper {
5757
console.log(`Running tests against: ${json.apiUrl}`);
5858
this.apiUrl = json.apiUrl;
5959
this.repositoryFactory = new RepositoryFactoryHttp(json.apiUrl);
60-
this.transactionService = new TransactionService(this.repositoryFactory.createTransactionRepository(), this.repositoryFactory.createReceiptRepository());
60+
this.transactionService = new TransactionService(
61+
this.repositoryFactory.createTransactionRepository(), this.repositoryFactory.createReceiptRepository());
6162
combineLatest(this.repositoryFactory.getGenerationHash(),
6263
this.repositoryFactory.getNetworkType()).subscribe(([generationHash, networkType]) => {
6364
this.networkType = networkType;

‎e2e/infrastructure/Listener.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import { AccountRepository } from '../../src/infrastructure/AccountRepository';
2020
import { NamespaceRepository } from '../../src/infrastructure/NamespaceRepository';
2121
import { TransactionRepository } from '../../src/infrastructure/TransactionRepository';
2222
import { Account } from '../../src/model/account/Account';
23-
import { NetworkType } from '../../src/model/blockchain/NetworkType';
2423
import { PlainMessage } from '../../src/model/message/PlainMessage';
2524
import { Address, CosignatureTransaction, LockFundsTransaction, Mosaic, SignedTransaction, UInt64 } from '../../src/model/model';
2625
import { MosaicId } from '../../src/model/mosaic/MosaicId';
2726
import { NetworkCurrencyLocal } from '../../src/model/mosaic/NetworkCurrencyLocal';
2827
import { NamespaceId } from '../../src/model/namespace/NamespaceId';
28+
import { NetworkType } from '../../src/model/network/NetworkType';
2929
import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction';
3030
import { Deadline } from '../../src/model/transaction/Deadline';
3131
import { MultisigAccountModificationTransaction } from '../../src/model/transaction/MultisigAccountModificationTransaction';

‎e2e/infrastructure/MetadataHttp.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import { expect } from 'chai';
1818
import { MetadataRepository } from '../../src/infrastructure/MetadataRepository';
1919
import { Account } from '../../src/model/account/Account';
2020
import { Address } from '../../src/model/account/Address';
21-
import { NetworkType } from '../../src/model/blockchain/NetworkType';
2221
import { MosaicFlags } from '../../src/model/mosaic/MosaicFlags';
2322
import { MosaicId } from '../../src/model/mosaic/MosaicId';
2423
import { MosaicNonce } from '../../src/model/mosaic/MosaicNonce';
2524
import { NamespaceId } from '../../src/model/namespace/NamespaceId';
25+
import { NetworkType } from '../../src/model/network/NetworkType';
2626
import { AccountMetadataTransaction } from '../../src/model/transaction/AccountMetadataTransaction';
2727
import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction';
2828
import { Deadline } from '../../src/model/transaction/Deadline';

‎e2e/infrastructure/MosaicHttp.spec.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ import { expect } from 'chai';
1717
import { MosaicRepository } from '../../src/infrastructure/MosaicRepository';
1818
import { NamespaceRepository } from '../../src/infrastructure/NamespaceRepository';
1919
import { Account } from '../../src/model/account/Account';
20-
import { NetworkType } from '../../src/model/blockchain/NetworkType';
2120
import { MosaicFlags } from '../../src/model/mosaic/MosaicFlags';
2221
import { MosaicId } from '../../src/model/mosaic/MosaicId';
2322
import { MosaicNonce } from '../../src/model/mosaic/MosaicNonce';
2423
import { AliasAction } from '../../src/model/namespace/AliasAction';
2524
import { NamespaceId } from '../../src/model/namespace/NamespaceId';
25+
import { NetworkType } from '../../src/model/network/NetworkType';
2626
import { Deadline } from '../../src/model/transaction/Deadline';
2727
import { MosaicAliasTransaction } from '../../src/model/transaction/MosaicAliasTransaction';
2828
import { MosaicDefinitionTransaction } from '../../src/model/transaction/MosaicDefinitionTransaction';
@@ -87,7 +87,8 @@ describe('MosaicHttp', () => {
8787
expect(mosaicDefinitionTransaction.nonce).to.deep.equal(listenedTransaction.nonce);
8888
expect(mosaicDefinitionTransaction.getMosaicNonceIntValue()).to.be.equal(listenedTransaction.getMosaicNonceIntValue());
8989

90-
const savedTransaction = await helper.repositoryFactory.createTransactionRepository().getTransaction(signedTransaction.hash).toPromise() as MosaicDefinitionTransaction;
90+
const savedTransaction = await helper.repositoryFactory.createTransactionRepository()
91+
.getTransaction(signedTransaction.hash).toPromise() as MosaicDefinitionTransaction;
9192
expect(mosaicDefinitionTransaction.nonce.toHex()).to.be.equal(savedTransaction.nonce.toHex());
9293
expect(mosaicDefinitionTransaction.nonce).to.deep.equal(savedTransaction.nonce);
9394
expect(mosaicDefinitionTransaction.getMosaicNonceIntValue()).to.be.equal(savedTransaction.getMosaicNonceIntValue());

‎e2e/infrastructure/NetworkHttp.spec.ts‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
import { expect } from 'chai';
1717
import { NetworkRepository } from '../../src/infrastructure/NetworkRepository';
18-
import { NetworkType } from '../../src/model/blockchain/NetworkType';
18+
import { NetworkType } from '../../src/model/network/NetworkType';
1919
import { IntegrationTestHelper } from './IntegrationTestHelper';
2020

2121
describe('NetworkHttp', () => {
@@ -45,13 +45,30 @@ describe('NetworkHttp', () => {
4545
});
4646
});
4747

48-
describe('getNetworkFees', () => {
49-
it('should return network fees', async () => {
50-
const fees = await networkRepository.getNetworkFees().toPromise();
48+
describe('getTransactionFees', () => {
49+
it('should return transaction fees', async () => {
50+
const fees = await networkRepository.getTransactionFees().toPromise();
5151
expect(fees.averageFeeMultiplier).to.be.not.null;
5252
expect(fees.highestFeeMultiplier).to.be.not.null;
5353
expect(fees.lowestFeeMultiplier).to.be.not.null;
5454
expect(fees.medianFeeMultiplier).to.be.not.null;
5555
});
5656
});
57+
describe('getRentalFees', () => {
58+
it('should return rental fees', async () => {
59+
const fees = await networkRepository.getRentalFees().toPromise();
60+
expect(fees.effectiveChildNamespaceRentalFee).to.be.not.null;
61+
expect(fees.effectiveMosaicRentalFee).to.be.not.null;
62+
expect(fees.effectiveRootNamespaceRentalFeePerBlock).to.be.not.null;
63+
});
64+
});
65+
66+
describe('getNetworkProperties', () => {
67+
it('should return network configuration', async () => {
68+
const config = await networkRepository.getNetworkProperties().toPromise();
69+
expect(config.network).to.be.not.null;
70+
expect(config.chain).to.be.not.null;
71+
expect(config.plugins).to.be.not.null;
72+
});
73+
});
5774
});

‎e2e/infrastructure/RestrictionHttp.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import { RestrictionAccountRepository } from '../../src/infrastructure/Restricti
2020
import { RestrictionMosaicRepository } from '../../src/infrastructure/RestrictionMosaicRepository';
2121
import { Account } from '../../src/model/account/Account';
2222
import { Address } from '../../src/model/account/Address';
23-
import { NetworkType } from '../../src/model/blockchain/NetworkType';
2423
import { MosaicFlags } from '../../src/model/mosaic/MosaicFlags';
2524
import { MosaicId } from '../../src/model/mosaic/MosaicId';
2625
import { MosaicNonce } from '../../src/model/mosaic/MosaicNonce';
26+
import { NetworkType } from '../../src/model/network/NetworkType';
2727
import { AccountRestrictionFlags } from '../../src/model/restriction/AccountRestrictionType';
2828
import { MosaicRestrictionEntryType } from '../../src/model/restriction/MosaicRestrictionEntryType';
2929
import { MosaicRestrictionType } from '../../src/model/restriction/MosaicRestrictionType';

‎e2e/infrastructure/TransactionHttp.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import { TransactionRepository } from '../../src/infrastructure/TransactionRepos
2828
import { Account } from '../../src/model/account/Account';
2929
import { Address } from '../../src/model/account/Address';
3030
import { PublicAccount } from '../../src/model/account/PublicAccount';
31-
import { NetworkType } from '../../src/model/blockchain/NetworkType';
3231
import { PlainMessage } from '../../src/model/message/PlainMessage';
3332
import { Mosaic } from '../../src/model/mosaic/Mosaic';
3433
import { MosaicFlags } from '../../src/model/mosaic/MosaicFlags';
@@ -38,6 +37,7 @@ import { MosaicSupplyChangeAction } from '../../src/model/mosaic/MosaicSupplyCha
3837
import { NetworkCurrencyLocal } from '../../src/model/mosaic/NetworkCurrencyLocal';
3938
import { AliasAction } from '../../src/model/namespace/AliasAction';
4039
import { NamespaceId } from '../../src/model/namespace/NamespaceId';
40+
import { NetworkType } from '../../src/model/network/NetworkType';
4141
import { AccountRestrictionModificationAction } from '../../src/model/restriction/AccountRestrictionModificationAction';
4242
import { AccountRestrictionFlags } from '../../src/model/restriction/AccountRestrictionType';
4343
import { MosaicRestrictionType } from '../../src/model/restriction/MosaicRestrictionType';

‎e2e/infrastructure/UnresolvedMapping.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ import { NamespaceRepository } from '../../src/infrastructure/NamespaceRepositor
1919
import { TransactionHttp } from '../../src/infrastructure/TransactionHttp';
2020
import { Account } from '../../src/model/account/Account';
2121
import { Address } from '../../src/model/account/Address';
22-
import { NetworkType } from '../../src/model/blockchain/NetworkType';
2322
import { PlainMessage } from '../../src/model/message/PlainMessage';
2423
import { MosaicFlags } from '../../src/model/mosaic/MosaicFlags';
2524
import { MosaicId } from '../../src/model/mosaic/MosaicId';
2625
import { MosaicNonce } from '../../src/model/mosaic/MosaicNonce';
2726
import { NetworkCurrencyLocal } from '../../src/model/mosaic/NetworkCurrencyLocal';
2827
import { AliasAction } from '../../src/model/namespace/AliasAction';
2928
import { NamespaceId } from '../../src/model/namespace/NamespaceId';
29+
import { NetworkType } from '../../src/model/network/NetworkType';
3030
import { MosaicRestrictionType } from '../../src/model/restriction/MosaicRestrictionType';
3131
import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction';
3232
import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction';

0 commit comments

Comments
 (0)