From 5e082ba399c292d8cff474f9be775533542d401b Mon Sep 17 00:00:00 2001 From: fernando Date: Sat, 7 Nov 2020 07:33:30 -0300 Subject: [PATCH] Added prettier-plugin-organize-imports to prettier. It fixes all the unsued imports warnings and order conflicts. It's integrated with npm run style:fox --- e2e/infrastructure/AccountHttp.spec.ts | 10 ++--- e2e/infrastructure/BlockHttp.spec.ts | 13 +++---- e2e/infrastructure/HashLockHttp.spec.ts | 18 ++++----- e2e/infrastructure/IntegrationTestHelper.ts | 3 +- e2e/infrastructure/Listener.spec.ts | 17 ++++----- e2e/infrastructure/MetadataHttp.spec.ts | 8 ++-- e2e/infrastructure/MosaicHttp.spec.ts | 8 ++-- e2e/infrastructure/NamespaceHttp.spec.ts | 6 +-- .../PersistentHarvesting.spec.ts | 6 +-- e2e/infrastructure/RestrictionHttp.spec.ts | 4 +- e2e/infrastructure/SecretLockHttp.spec.ts | 16 ++++---- e2e/infrastructure/TransactionHttp.spec.ts | 38 +++++++++---------- e2e/infrastructure/UnresolvedMapping.spec.ts | 7 +--- e2e/service/AccountService.spec.ts | 6 +-- e2e/service/BlockService.spec.ts | 6 +-- e2e/service/CurrencyService.spec.ts | 2 +- e2e/service/TransactionService.spec.ts | 12 ++---- ...TransactionService_AggregateBonded.spec.ts | 5 +-- package-lock.json | 8 +++- package.json | 3 +- src/core/crypto/Crypto.ts | 4 +- src/core/crypto/Utilities.ts | 6 +-- src/core/crypto/index.ts | 2 +- src/core/utils/LockHashUtils.ts | 4 +- src/core/utils/UnresolvedMapping.ts | 4 +- src/infrastructure/AccountHttp.ts | 10 ++--- src/infrastructure/ChainHttp.ts | 4 +- src/infrastructure/FinalizationHttp.ts | 6 +-- src/infrastructure/HashLockHttp.ts | 8 ++-- src/infrastructure/HashLockRepository.ts | 2 +- src/infrastructure/Http.ts | 4 +- src/infrastructure/IListener.ts | 2 +- src/infrastructure/Listener.ts | 2 +- src/infrastructure/MetadataHttp.ts | 8 ++-- src/infrastructure/NamespaceHttp.ts | 4 +- src/infrastructure/ReceiptHttp.ts | 8 ++-- src/infrastructure/ReceiptRepository.ts | 6 +-- src/infrastructure/RepositoryFactory.ts | 6 +-- src/infrastructure/RepositoryFactoryHttp.ts | 14 +++---- src/infrastructure/RestrictionMosaicHttp.ts | 4 +- .../RestrictionMosaicRepository.ts | 2 +- src/infrastructure/SecretLockHttp.ts | 8 ++-- src/infrastructure/SecretLockRepository.ts | 2 +- src/infrastructure/index.ts | 10 +++-- .../AccountPaginationStreamer.ts | 4 +- .../HashLockPaginationStreamer.ts | 4 +- .../MetadataPaginationStreamer.ts | 4 +- .../NamespacePaginationStreamer.ts | 4 +- .../ReceiptPaginationStreamer.ts | 8 ++-- .../RestrictionMosaicPaginationStreamer.ts | 6 +-- .../SecretLockPaginationStreamer.ts | 4 +- .../searchCriteria/AccountSearchCriteria.ts | 2 +- .../searchCriteria/HashLockSearchCriteria.ts | 2 +- .../searchCriteria/MetadataSearchCriteria.ts | 6 +-- .../searchCriteria/NamespaceSearchCriteria.ts | 6 +-- .../ResolutionStatementSearchCriteria.ts | 2 +- .../RestrictionMosaicSearchCriteria.ts | 4 +- .../SecretLockSearchCriteria.ts | 2 +- .../TransactionStatementSearchCriteria.ts | 8 ++-- .../account/AccountInfoResolvedMosaic.ts | 2 +- src/model/account/UnresolvedAddress.ts | 2 +- src/model/blockchain/BlockInfo.ts | 2 +- src/model/blockchain/NewBlock.ts | 2 +- src/model/index.ts | 5 ++- src/model/message/Message.ts | 2 +- src/model/metadata/MetadataEntry.ts | 4 +- src/model/mosaic/MosaicId.ts | 2 +- src/model/mosaic/MosaicInfo.ts | 2 +- src/model/namespace/NamespaceId.ts | 2 +- src/model/namespace/NamespaceInfo.ts | 2 +- src/model/receipt/ArtifactExpiryReceipt.ts | 2 +- src/model/receipt/BalanceChangeReceipt.ts | 5 +-- src/model/receipt/ResolutionStatement.ts | 4 +- src/model/receipt/Statement.ts | 4 +- src/model/restriction/AccountRestriction.ts | 2 +- .../AccountAddressRestrictionTransaction.ts | 6 +-- .../transaction/AccountKeyLinkTransaction.ts | 2 +- .../transaction/AccountMetadataTransaction.ts | 10 ++--- .../AccountMosaicRestrictionTransaction.ts | 8 ++-- .../AccountOperationRestrictionTransaction.ts | 4 +- .../AccountRestrictionTransaction.ts | 12 +++--- src/model/transaction/AggregateTransaction.ts | 4 +- src/model/transaction/AliasTransaction.ts | 2 +- src/model/transaction/LockFundsTransaction.ts | 4 +- .../MosaicAddressRestrictionTransaction.ts | 6 +-- .../transaction/MosaicAliasTransaction.ts | 2 +- .../MosaicDefinitionTransaction.ts | 2 +- .../MosaicGlobalRestrictionTransaction.ts | 6 +-- .../transaction/MosaicMetadataTransaction.ts | 10 ++--- .../MosaicSupplyChangeTransaction.ts | 6 +-- .../MultisigAccountModificationTransaction.ts | 10 ++--- .../NamespaceMetadataTransaction.ts | 8 ++-- .../NamespaceRegistrationTransaction.ts | 2 +- .../transaction/NodeKeyLinkTransaction.ts | 6 +-- .../PersistentDelegationRequestTransaction.ts | 2 +- .../transaction/SecretLockTransaction.ts | 6 +-- .../transaction/SecretProofTransaction.ts | 6 +-- src/model/transaction/Transaction.ts | 4 +- src/model/transaction/TransferTransaction.ts | 10 ++--- .../transaction/VotingKeyLinkTransaction.ts | 10 ++--- .../transaction/VrfKeyLinkTransaction.ts | 6 +-- src/service/AccountService.ts | 19 +++++----- src/service/AggregateTransactionService.ts | 8 ++-- src/service/BlockService.ts | 10 ++--- src/service/MetadataTransactionService.ts | 2 +- .../MosaicRestrictionTransactionService.ts | 8 ++-- src/service/MosaicService.ts | 2 +- src/service/TransactionService.ts | 9 ++--- src/service/index.ts | 2 +- src/service/interfaces/IAccountService.ts | 2 +- src/service/interfaces/ICurrencyService.ts | 4 +- test/core/crypto/hkdf.spec.ts | 2 +- test/core/utils/DtoMapping.spec.ts | 10 ++--- test/core/utils/EnumMapping.spec.ts | 6 +-- test/core/utils/Hashes.spec.ts | 8 ++-- test/core/utils/TransactionMapping.spec.ts | 29 ++++++-------- .../TransactionMappingWithSignatures.spec.ts | 28 ++++++-------- test/infrastructure/AccountHttp.spec.ts | 6 +-- test/infrastructure/ChainHttp.spec.ts | 2 +- test/infrastructure/FinalizationHttp.spec.ts | 10 ++--- test/infrastructure/HashLockHttp.spec.ts | 2 +- test/infrastructure/Listener.spec.ts | 2 +- test/infrastructure/MetadataHttp.spec.ts | 4 +- test/infrastructure/NamespaceHttp.spec.ts | 2 +- test/infrastructure/Page.spec.ts | 4 +- test/infrastructure/ReceiptHttp.spec.ts | 20 +++++----- test/infrastructure/RepositoryFactory.spec.ts | 10 ++--- .../RestrictionMosaicHttp.spec.ts | 4 +- test/infrastructure/SecretLockHttp.spec.ts | 6 +-- .../SerializeTransactionToJSON.spec.ts | 2 +- test/infrastructure/TransactionHttp.spec.ts | 1 - .../TransactionStatusHttp.spec.ts | 1 - .../AccountPaginationStreamer.spec.ts | 2 +- .../HashLockPaginationStreamer.spec.ts | 4 +- .../MetadataPaginationStreamer.spec.ts | 2 +- ...saicRestrictionsPaginationStreamer.spec.ts | 2 +- .../NamespacePaginationStreamer.spec.ts | 2 +- .../ReceiptPaginationStreamer.spec.ts | 2 +- .../SecretLockPaginationStreamer.spec.ts | 2 +- .../CreateTransactionFromDTO.spec.ts | 2 +- test/model/account/Account.spec.ts | 10 ++--- test/model/account/AccountInfo.spec.ts | 6 +-- .../account/MultisigAccountGraphInfo.spec.ts | 2 +- .../model/account/MultisigAccountInfo.spec.ts | 2 +- test/model/blockchain/BlockInfo.spec.ts | 2 +- test/model/blockchain/NewBlock.spec.ts | 4 +- test/model/lock/HashLockInfo.spec.ts | 6 +-- test/model/lock/SecretLockInfo.spec.ts | 6 +-- test/model/metadata/MetadataEntry.spec.ts | 4 +- test/model/mosaic/MosaicAmountView.spec.ts | 2 +- test/model/mosaic/MosaicId.spec.ts | 2 +- test/model/mosaic/MosaicInfo.spec.ts | 2 +- test/model/mosaic/MosaicNames.spec.ts | 2 +- test/model/mosaic/MosaicView.spec.ts | 2 +- test/model/namespace/NamespaceInfo.spec.ts | 2 +- test/model/receipt/Receipt.spec.ts | 2 +- test/model/receipt/ResolutionEntry.spec.ts | 2 +- .../AccountKeyLinkTransaction.spec.ts | 2 +- .../AccountMetadataTransaction.spec.ts | 10 ++--- .../AccountRestrictionTransaction.spec.ts | 8 ++-- .../AddressAliasTransaction.spec.ts | 2 +- .../transaction/AggregateTransaction.spec.ts | 2 +- test/model/transaction/Deadline.spec.ts | 2 +- .../HashTypeLengthValidator.spec.ts | 2 +- .../MosaicAliasTransaction.spec.ts | 8 ++-- .../MosaicMetadataTransaction.spec.ts | 6 +-- ...isigAccountModificationTransaction.spec.ts | 4 +- .../NamespaceMetadataTransaction.spec.ts | 8 ++-- .../NodeKeyLinkTransaction.spec.ts | 4 +- .../transaction/SecretLockTransaction.spec.ts | 4 +- .../SecretProofTransaction.spec.ts | 8 ++-- .../transaction/SignedTransaction.spec.ts | 1 - test/model/transaction/Transaction.spec.ts | 4 +- .../transaction/TransactionStatus.spec.ts | 3 +- .../transaction/TransferTransaction.spec.ts | 10 ++--- .../VotingKeyLinkTransaction.spec.ts | 4 +- .../transaction/VrfKeyLinkTransaction.spec.ts | 4 +- test/service/AccountService.spec.ts | 23 +++++------ .../AggregateTransactionService.spec.ts | 9 ++--- test/service/BlockService.spec.ts | 16 ++++---- test/service/CurrencyService.spec.ts | 2 +- .../MetadataTransactionservice.spec.ts | 2 +- ...osaicRestrictionTransactionservice.spec.ts | 2 +- test/service/MosaicService.spec.ts | 18 ++++----- test/service/NamespaceService.spec.ts | 2 +- test/service/TransactionService.spec.ts | 5 +-- 186 files changed, 516 insertions(+), 550 deletions(-) diff --git a/e2e/infrastructure/AccountHttp.spec.ts b/e2e/infrastructure/AccountHttp.spec.ts index 7de5fc82f1..a12ee06a39 100644 --- a/e2e/infrastructure/AccountHttp.spec.ts +++ b/e2e/infrastructure/AccountHttp.spec.ts @@ -14,11 +14,16 @@ * limitations under the License. */ +import { deepEqual } from 'assert'; import { expect } from 'chai'; +import { take, toArray } from 'rxjs/operators'; +import { Order } from '../../src/infrastructure'; import { AccountRepository } from '../../src/infrastructure/AccountRepository'; import { MultisigRepository } from '../../src/infrastructure/MultisigRepository'; import { NamespaceRepository } from '../../src/infrastructure/NamespaceRepository'; +import { AccountPaginationStreamer } from '../../src/infrastructure/paginationStreamer/AccountPaginationStreamer'; import { RepositoryCallError } from '../../src/infrastructure/RepositoryCallError'; +import { AccountOrderBy } from '../../src/infrastructure/searchCriteria/AccountOrderBy'; import { Account } from '../../src/model/account/Account'; import { Address } from '../../src/model/account/Address'; import { PlainMessage } from '../../src/model/message/PlainMessage'; @@ -33,11 +38,6 @@ import { NamespaceRegistrationTransaction } from '../../src/model/transaction/Na import { TransferTransaction } from '../../src/model/transaction/TransferTransaction'; import { UInt64 } from '../../src/model/UInt64'; import { IntegrationTestHelper } from './IntegrationTestHelper'; -import { AccountPaginationStreamer } from '../../src/infrastructure/paginationStreamer/AccountPaginationStreamer'; -import { toArray, take } from 'rxjs/operators'; -import { deepEqual } from 'assert'; -import { Order } from '../../src/infrastructure'; -import { AccountOrderBy } from '../../src/infrastructure/searchCriteria/AccountOrderBy'; describe('AccountHttp', () => { const helper = new IntegrationTestHelper(); diff --git a/e2e/infrastructure/BlockHttp.spec.ts b/e2e/infrastructure/BlockHttp.spec.ts index faac630bc5..d209d5ed3a 100644 --- a/e2e/infrastructure/BlockHttp.spec.ts +++ b/e2e/infrastructure/BlockHttp.spec.ts @@ -14,10 +14,15 @@ * limitations under the License. */ +import { deepEqual } from 'assert'; import { expect } from 'chai'; -import { mergeMap, toArray } from 'rxjs/operators'; +import { mergeMap, take, toArray } from 'rxjs/operators'; +import { Order } from '../../src/infrastructure'; import { BlockRepository } from '../../src/infrastructure/BlockRepository'; +import { BlockPaginationStreamer } from '../../src/infrastructure/paginationStreamer/BlockPaginationStreamer'; +import { ReceiptPaginationStreamer } from '../../src/infrastructure/paginationStreamer/ReceiptPaginationStreamer'; import { ReceiptRepository } from '../../src/infrastructure/ReceiptRepository'; +import { TransactionStatement } from '../../src/model'; import { Account } from '../../src/model/account/Account'; import { PlainMessage } from '../../src/model/message/PlainMessage'; import { NetworkType } from '../../src/model/network/NetworkType'; @@ -25,12 +30,6 @@ import { Deadline } from '../../src/model/transaction/Deadline'; import { TransferTransaction } from '../../src/model/transaction/TransferTransaction'; import { UInt64 } from '../../src/model/UInt64'; import { IntegrationTestHelper } from './IntegrationTestHelper'; -import { BlockPaginationStreamer } from '../../src/infrastructure/paginationStreamer/BlockPaginationStreamer'; -import { deepEqual } from 'assert'; -import { take } from 'rxjs/operators'; -import { TransactionStatement } from '../../src/model'; -import { ReceiptPaginationStreamer } from '../../src/infrastructure/paginationStreamer/ReceiptPaginationStreamer'; -import { Order } from '../../src/infrastructure'; describe('BlockHttp', () => { const helper = new IntegrationTestHelper(); diff --git a/e2e/infrastructure/HashLockHttp.spec.ts b/e2e/infrastructure/HashLockHttp.spec.ts index 3791a109fb..43df83c4c5 100644 --- a/e2e/infrastructure/HashLockHttp.spec.ts +++ b/e2e/infrastructure/HashLockHttp.spec.ts @@ -14,26 +14,26 @@ * limitations under the License. */ +import { ChronoUnit } from '@js-joda/core'; +import { deepEqual } from 'assert'; import { expect } from 'chai'; +import { take, toArray } from 'rxjs/operators'; +import { HashLockPaginationStreamer, Order } from '../../src/infrastructure'; +import { HashLockRepository } from '../../src/infrastructure/HashLockRepository'; import { Account } from '../../src/model/account/Account'; import { Address } from '../../src/model/account/Address'; import { PlainMessage } from '../../src/model/message/PlainMessage'; +import { Mosaic } from '../../src/model/mosaic/Mosaic'; +import { UnresolvedMosaicId } from '../../src/model/mosaic/UnresolvedMosaicId'; import { NetworkType } from '../../src/model/network/NetworkType'; import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction'; import { Deadline } from '../../src/model/transaction/Deadline'; +import { LockFundsTransaction } from '../../src/model/transaction/LockFundsTransaction'; import { MultisigAccountModificationTransaction } from '../../src/model/transaction/MultisigAccountModificationTransaction'; +import { SignedTransaction } from '../../src/model/transaction/SignedTransaction'; import { TransferTransaction } from '../../src/model/transaction/TransferTransaction'; import { UInt64 } from '../../src/model/UInt64'; import { IntegrationTestHelper } from './IntegrationTestHelper'; -import { toArray, take } from 'rxjs/operators'; -import { deepEqual } from 'assert'; -import { Order, HashLockPaginationStreamer } from '../../src/infrastructure'; -import { Mosaic } from '../../src/model/mosaic/Mosaic'; -import { LockFundsTransaction } from '../../src/model/transaction/LockFundsTransaction'; -import { ChronoUnit } from '@js-joda/core'; -import { SignedTransaction } from '../../src/model/transaction/SignedTransaction'; -import { UnresolvedMosaicId } from '../../src/model/mosaic/UnresolvedMosaicId'; -import { HashLockRepository } from '../../src/infrastructure/HashLockRepository'; describe('HashLockHttp', () => { const helper = new IntegrationTestHelper(); diff --git a/e2e/infrastructure/IntegrationTestHelper.ts b/e2e/infrastructure/IntegrationTestHelper.ts index 36d8cbb26e..ce219dcaed 100644 --- a/e2e/infrastructure/IntegrationTestHelper.ts +++ b/e2e/infrastructure/IntegrationTestHelper.ts @@ -19,8 +19,7 @@ import { IListener } from '../../src/infrastructure/IListener'; import { RepositoryFactory } from '../../src/infrastructure/RepositoryFactory'; import { RepositoryFactoryHttp } from '../../src/infrastructure/RepositoryFactoryHttp'; import { Account } from '../../src/model/account/Account'; -import { Mosaic } from '../../src/model/mosaic'; -import { Currency } from '../../src/model/mosaic'; +import { Currency, Mosaic } from '../../src/model/mosaic'; import { NetworkType } from '../../src/model/network/NetworkType'; import { SignedTransaction } from '../../src/model/transaction/SignedTransaction'; import { Transaction } from '../../src/model/transaction/Transaction'; diff --git a/e2e/infrastructure/Listener.spec.ts b/e2e/infrastructure/Listener.spec.ts index 17022d420c..568c8adf64 100644 --- a/e2e/infrastructure/Listener.spec.ts +++ b/e2e/infrastructure/Listener.spec.ts @@ -13,26 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { assert, expect } from 'chai'; import { ChronoUnit } from '@js-joda/core'; +import { assert, expect } from 'chai'; import { filter, mergeMap } from 'rxjs/operators'; +import { TransactionSearchCriteria } from '../../src/infrastructure/searchCriteria/TransactionSearchCriteria'; +import { TransactionGroup } from '../../src/infrastructure/TransactionGroup'; import { TransactionRepository } from '../../src/infrastructure/TransactionRepository'; -import { Account } from '../../src/model/account'; +import { Account, Address } from '../../src/model/account'; import { PlainMessage } from '../../src/model/message/PlainMessage'; import { Currency } from '../../src/model/mosaic'; import { NetworkType } from '../../src/model/network/NetworkType'; import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction'; +import { CosignatureTransaction } from '../../src/model/transaction/CosignatureTransaction'; import { Deadline } from '../../src/model/transaction/Deadline'; +import { LockFundsTransaction } from '../../src/model/transaction/LockFundsTransaction'; import { MultisigAccountModificationTransaction } from '../../src/model/transaction/MultisigAccountModificationTransaction'; -import { TransferTransaction } from '../../src/model/transaction/TransferTransaction'; -import { IntegrationTestHelper } from './IntegrationTestHelper'; -import { TransactionSearchCriteria } from '../../src/infrastructure/searchCriteria/TransactionSearchCriteria'; -import { Address } from '../../src/model/account'; import { SignedTransaction } from '../../src/model/transaction/SignedTransaction'; -import { LockFundsTransaction } from '../../src/model/transaction/LockFundsTransaction'; +import { TransferTransaction } from '../../src/model/transaction/TransferTransaction'; import { UInt64 } from '../../src/model/UInt64'; -import { CosignatureTransaction } from '../../src/model/transaction/CosignatureTransaction'; -import { TransactionGroup } from '../../src/infrastructure/TransactionGroup'; +import { IntegrationTestHelper } from './IntegrationTestHelper'; describe('Listener', () => { const helper = new IntegrationTestHelper(); diff --git a/e2e/infrastructure/MetadataHttp.spec.ts b/e2e/infrastructure/MetadataHttp.spec.ts index e6363c0d1d..5caa05ee0b 100644 --- a/e2e/infrastructure/MetadataHttp.spec.ts +++ b/e2e/infrastructure/MetadataHttp.spec.ts @@ -14,8 +14,12 @@ * limitations under the License. */ +import { deepEqual } from 'assert'; import { expect } from 'chai'; +import { take, toArray } from 'rxjs/operators'; +import { MetadataPaginationStreamer, Order } from '../../src/infrastructure'; import { MetadataRepository } from '../../src/infrastructure/MetadataRepository'; +import { MetadataType } from '../../src/model'; import { Account } from '../../src/model/account/Account'; import { Address } from '../../src/model/account/Address'; import { MosaicFlags } from '../../src/model/mosaic/MosaicFlags'; @@ -32,10 +36,6 @@ import { NamespaceMetadataTransaction } from '../../src/model/transaction/Namesp import { NamespaceRegistrationTransaction } from '../../src/model/transaction/NamespaceRegistrationTransaction'; import { UInt64 } from '../../src/model/UInt64'; import { IntegrationTestHelper } from './IntegrationTestHelper'; -import { MetadataType } from '../../src/model'; -import { Order, MetadataPaginationStreamer } from '../../src/infrastructure'; -import { deepEqual } from 'assert'; -import { take, toArray } from 'rxjs/operators'; describe('MetadataHttp', () => { const helper = new IntegrationTestHelper(); diff --git a/e2e/infrastructure/MosaicHttp.spec.ts b/e2e/infrastructure/MosaicHttp.spec.ts index 4a45f5e959..5a7d20be99 100644 --- a/e2e/infrastructure/MosaicHttp.spec.ts +++ b/e2e/infrastructure/MosaicHttp.spec.ts @@ -13,9 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { deepEqual } from 'assert'; import { expect } from 'chai'; +import { take, toArray } from 'rxjs/operators'; import { MosaicRepository } from '../../src/infrastructure/MosaicRepository'; import { NamespaceRepository } from '../../src/infrastructure/NamespaceRepository'; +import { MosaicPaginationStreamer } from '../../src/infrastructure/paginationStreamer/MosaicPaginationStreamer'; +import { TransactionGroup } from '../../src/infrastructure/TransactionGroup'; import { Account } from '../../src/model/account/Account'; import { MosaicFlags } from '../../src/model/mosaic/MosaicFlags'; import { MosaicId } from '../../src/model/mosaic/MosaicId'; @@ -29,10 +33,6 @@ import { MosaicDefinitionTransaction } from '../../src/model/transaction/MosaicD import { NamespaceRegistrationTransaction } from '../../src/model/transaction/NamespaceRegistrationTransaction'; import { UInt64 } from '../../src/model/UInt64'; import { IntegrationTestHelper } from './IntegrationTestHelper'; -import { MosaicPaginationStreamer } from '../../src/infrastructure/paginationStreamer/MosaicPaginationStreamer'; -import { toArray, take } from 'rxjs/operators'; -import { deepEqual } from 'assert'; -import { TransactionGroup } from '../../src/infrastructure/TransactionGroup'; describe('MosaicHttp', () => { let mosaicId: MosaicId; diff --git a/e2e/infrastructure/NamespaceHttp.spec.ts b/e2e/infrastructure/NamespaceHttp.spec.ts index 11603e98e1..473762eac9 100644 --- a/e2e/infrastructure/NamespaceHttp.spec.ts +++ b/e2e/infrastructure/NamespaceHttp.spec.ts @@ -15,7 +15,10 @@ */ import { deepEqual } from 'assert'; import { expect } from 'chai'; +import { take, toArray } from 'rxjs/operators'; +import { Order } from '../../src/infrastructure'; import { NamespaceRepository } from '../../src/infrastructure/NamespaceRepository'; +import { NamespacePaginationStreamer } from '../../src/infrastructure/paginationStreamer/NamespacePaginationStreamer'; import { Account } from '../../src/model/account/Account'; import { Address } from '../../src/model/account/Address'; import { AliasAction } from '../../src/model/namespace/AliasAction'; @@ -25,9 +28,6 @@ import { Deadline } from '../../src/model/transaction/Deadline'; import { NamespaceRegistrationTransaction } from '../../src/model/transaction/NamespaceRegistrationTransaction'; import { UInt64 } from '../../src/model/UInt64'; import { IntegrationTestHelper } from './IntegrationTestHelper'; -import { NamespacePaginationStreamer } from '../../src/infrastructure/paginationStreamer/NamespacePaginationStreamer'; -import { take, toArray } from 'rxjs/operators'; -import { Order } from '../../src/infrastructure'; describe('NamespaceHttp', () => { let defaultNamespaceId: NamespaceId; diff --git a/e2e/infrastructure/PersistentHarvesting.spec.ts b/e2e/infrastructure/PersistentHarvesting.spec.ts index 543cb784b5..9c87693381 100644 --- a/e2e/infrastructure/PersistentHarvesting.spec.ts +++ b/e2e/infrastructure/PersistentHarvesting.spec.ts @@ -16,13 +16,13 @@ import { Account } from '../../src/model/account/Account'; import { NetworkType } from '../../src/model/network/NetworkType'; +import { AccountKeyLinkTransaction } from '../../src/model/transaction/AccountKeyLinkTransaction'; import { Deadline } from '../../src/model/transaction/Deadline'; -import { IntegrationTestHelper } from './IntegrationTestHelper'; import { LinkAction } from '../../src/model/transaction/LinkAction'; -import { AccountKeyLinkTransaction } from '../../src/model/transaction/AccountKeyLinkTransaction'; +import { NodeKeyLinkTransaction } from '../../src/model/transaction/NodeKeyLinkTransaction'; import { PersistentDelegationRequestTransaction } from '../../src/model/transaction/PersistentDelegationRequestTransaction'; import { VrfKeyLinkTransaction } from '../../src/model/transaction/VrfKeyLinkTransaction'; -import { NodeKeyLinkTransaction } from '../../src/model/transaction/NodeKeyLinkTransaction'; +import { IntegrationTestHelper } from './IntegrationTestHelper'; describe('PersistentHarvesting', () => { const helper = new IntegrationTestHelper(); diff --git a/e2e/infrastructure/RestrictionHttp.spec.ts b/e2e/infrastructure/RestrictionHttp.spec.ts index e94bb9a76f..70f03f286d 100644 --- a/e2e/infrastructure/RestrictionHttp.spec.ts +++ b/e2e/infrastructure/RestrictionHttp.spec.ts @@ -24,6 +24,8 @@ import { MosaicFlags } from '../../src/model/mosaic/MosaicFlags'; import { MosaicId } from '../../src/model/mosaic/MosaicId'; import { MosaicNonce } from '../../src/model/mosaic/MosaicNonce'; import { NetworkType } from '../../src/model/network/NetworkType'; +import { AddressRestrictionFlag } from '../../src/model/restriction/AddressRestrictionFlag'; +import { MosaicAddressRestriction } from '../../src/model/restriction/MosaicAddressRestriction'; import { MosaicRestrictionEntryType } from '../../src/model/restriction/MosaicRestrictionEntryType'; import { MosaicRestrictionType } from '../../src/model/restriction/MosaicRestrictionType'; import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction'; @@ -34,8 +36,6 @@ import { MosaicDefinitionTransaction } from '../../src/model/transaction/MosaicD import { MosaicGlobalRestrictionTransaction } from '../../src/model/transaction/MosaicGlobalRestrictionTransaction'; import { UInt64 } from '../../src/model/UInt64'; import { IntegrationTestHelper } from './IntegrationTestHelper'; -import { AddressRestrictionFlag } from '../../src/model/restriction/AddressRestrictionFlag'; -import { MosaicAddressRestriction } from '../../src/model/restriction/MosaicAddressRestriction'; describe('RestrictionHttp', () => { const helper = new IntegrationTestHelper(); diff --git a/e2e/infrastructure/SecretLockHttp.spec.ts b/e2e/infrastructure/SecretLockHttp.spec.ts index 4e5d70c1c1..e5e7af1766 100644 --- a/e2e/infrastructure/SecretLockHttp.spec.ts +++ b/e2e/infrastructure/SecretLockHttp.spec.ts @@ -14,20 +14,20 @@ * limitations under the License. */ +import { deepEqual } from 'assert'; import { expect } from 'chai'; +import { sha3_256 } from 'js-sha3'; +import { take, toArray } from 'rxjs/operators'; +import { Crypto } from '../../src/core/crypto'; +import { Order, SecretLockPaginationStreamer } from '../../src/infrastructure'; +import { SecretLockRepository } from '../../src/infrastructure/SecretLockRepository'; import { Account } from '../../src/model/account/Account'; +import { LockHashAlgorithm } from '../../src/model/lock/LockHashAlgorithm'; import { NetworkType } from '../../src/model/network/NetworkType'; import { Deadline } from '../../src/model/transaction/Deadline'; +import { SecretLockTransaction } from '../../src/model/transaction/SecretLockTransaction'; import { UInt64 } from '../../src/model/UInt64'; import { IntegrationTestHelper } from './IntegrationTestHelper'; -import { toArray, take } from 'rxjs/operators'; -import { deepEqual } from 'assert'; -import { Order, SecretLockPaginationStreamer } from '../../src/infrastructure'; -import { SecretLockRepository } from '../../src/infrastructure/SecretLockRepository'; -import { SecretLockTransaction } from '../../src/model/transaction/SecretLockTransaction'; -import { LockHashAlgorithm } from '../../src/model/lock/LockHashAlgorithm'; -import { sha3_256 } from 'js-sha3'; -import { Crypto } from '../../src/core/crypto'; describe('SecretLockHttp', () => { const helper = new IntegrationTestHelper(); diff --git a/e2e/infrastructure/TransactionHttp.spec.ts b/e2e/infrastructure/TransactionHttp.spec.ts index 37edd7774f..9dfc863e29 100644 --- a/e2e/infrastructure/TransactionHttp.spec.ts +++ b/e2e/infrastructure/TransactionHttp.spec.ts @@ -13,15 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { expect } from 'chai'; import { ChronoUnit } from '@js-joda/core'; +import { deepEqual } from 'assert'; +import { expect } from 'chai'; +import * as CryptoJS from 'crypto-js'; +import { sha256 } from 'js-sha256'; import { sha3_256 } from 'js-sha3'; +import * as ripemd160 from 'ripemd160'; +import { take, toArray } from 'rxjs/operators'; +import * as secureRandom from 'secure-random'; import { Crypto } from '../../src/core/crypto'; import { Convert, Convert as convert } from '../../src/core/format'; +import { LockHashUtils } from '../../src/core/utils/LockHashUtils'; import { TransactionMapping } from '../../src/core/utils/TransactionMapping'; +import { TransactionSearchCriteria } from '../../src/infrastructure'; import { NamespaceRepository } from '../../src/infrastructure/NamespaceRepository'; +import { TransactionPaginationStreamer } from '../../src/infrastructure/paginationStreamer/TransactionPaginationStreamer'; +import { TransactionGroup } from '../../src/infrastructure/TransactionGroup'; import { TransactionRepository } from '../../src/infrastructure/TransactionRepository'; +import { TransactionStatusRepository } from '../../src/infrastructure/TransactionStatusRepository'; import { Account } from '../../src/model/account/Account'; +import { LockHashAlgorithm } from '../../src/model/lock/LockHashAlgorithm'; import { PlainMessage } from '../../src/model/message/PlainMessage'; import { Mosaic } from '../../src/model/mosaic/Mosaic'; import { MosaicFlags } from '../../src/model/mosaic/MosaicFlags'; @@ -32,7 +44,10 @@ import { AliasAction } from '../../src/model/namespace/AliasAction'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; import { NetworkType } from '../../src/model/network/NetworkType'; import { AccountRestrictionModificationAction } from '../../src/model/restriction/AccountRestrictionModificationAction'; +import { AddressRestrictionFlag } from '../../src/model/restriction/AddressRestrictionFlag'; +import { MosaicRestrictionFlag } from '../../src/model/restriction/MosaicRestrictionFlag'; import { MosaicRestrictionType } from '../../src/model/restriction/MosaicRestrictionType'; +import { OperationRestrictionFlag } from '../../src/model/restriction/OperationRestrictionFlag'; import { AccountAddressRestrictionTransaction } from '../../src/model/transaction/AccountAddressRestrictionTransaction'; import { AccountKeyLinkTransaction } from '../../src/model/transaction/AccountKeyLinkTransaction'; import { AccountMetadataTransaction } from '../../src/model/transaction/AccountMetadataTransaction'; @@ -46,7 +61,6 @@ import { CosignatureSignedTransaction } from '../../src/model/transaction/Cosign import { CosignatureTransaction } from '../../src/model/transaction/CosignatureTransaction'; import { Deadline } from '../../src/model/transaction/Deadline'; import { HashLockTransaction } from '../../src/model/transaction/HashLockTransaction'; -import { LockHashAlgorithm } from '../../src/model/lock/LockHashAlgorithm'; import { LinkAction } from '../../src/model/transaction/LinkAction'; import { LockFundsTransaction } from '../../src/model/transaction/LockFundsTransaction'; import { MosaicAddressRestrictionTransaction } from '../../src/model/transaction/MosaicAddressRestrictionTransaction'; @@ -57,29 +71,15 @@ import { MosaicMetadataTransaction } from '../../src/model/transaction/MosaicMet import { MosaicSupplyChangeTransaction } from '../../src/model/transaction/MosaicSupplyChangeTransaction'; import { NamespaceMetadataTransaction } from '../../src/model/transaction/NamespaceMetadataTransaction'; import { NamespaceRegistrationTransaction } from '../../src/model/transaction/NamespaceRegistrationTransaction'; +import { NodeKeyLinkTransaction } from '../../src/model/transaction/NodeKeyLinkTransaction'; import { SecretLockTransaction } from '../../src/model/transaction/SecretLockTransaction'; import { SecretProofTransaction } from '../../src/model/transaction/SecretProofTransaction'; import { TransactionType } from '../../src/model/transaction/TransactionType'; import { TransferTransaction } from '../../src/model/transaction/TransferTransaction'; +import { VotingKeyLinkTransaction } from '../../src/model/transaction/VotingKeyLinkTransaction'; +import { VrfKeyLinkTransaction } from '../../src/model/transaction/VrfKeyLinkTransaction'; import { UInt64 } from '../../src/model/UInt64'; import { IntegrationTestHelper } from './IntegrationTestHelper'; -import { LockHashUtils } from '../../src/core/utils/LockHashUtils'; -import { TransactionSearchCriteria } from '../../src/infrastructure'; -import { VrfKeyLinkTransaction } from '../../src/model/transaction/VrfKeyLinkTransaction'; -import { VotingKeyLinkTransaction } from '../../src/model/transaction/VotingKeyLinkTransaction'; -import { NodeKeyLinkTransaction } from '../../src/model/transaction/NodeKeyLinkTransaction'; -import { TransactionPaginationStreamer } from '../../src/infrastructure/paginationStreamer/TransactionPaginationStreamer'; -import { toArray, take } from 'rxjs/operators'; -import { deepEqual } from 'assert'; -import { AddressRestrictionFlag } from '../../src/model/restriction/AddressRestrictionFlag'; -import { MosaicRestrictionFlag } from '../../src/model/restriction/MosaicRestrictionFlag'; -import { OperationRestrictionFlag } from '../../src/model/restriction/OperationRestrictionFlag'; -import { TransactionGroup } from '../../src/infrastructure/TransactionGroup'; -import { TransactionStatusRepository } from '../../src/infrastructure/TransactionStatusRepository'; -import * as ripemd160 from 'ripemd160'; -import { sha256 } from 'js-sha256'; -import * as secureRandom from 'secure-random'; -import * as CryptoJS from 'crypto-js'; describe('TransactionHttp', () => { let transactionHash: string; diff --git a/e2e/infrastructure/UnresolvedMapping.spec.ts b/e2e/infrastructure/UnresolvedMapping.spec.ts index 1695ce65b1..d00f8ece10 100644 --- a/e2e/infrastructure/UnresolvedMapping.spec.ts +++ b/e2e/infrastructure/UnresolvedMapping.spec.ts @@ -17,11 +17,8 @@ import { expect } from 'chai'; import { Convert } from '../../src/core/format'; import { Account } from '../../src/model/account'; import { PlainMessage } from '../../src/model/message/PlainMessage'; -import { MosaicFlags } from '../../src/model/mosaic'; -import { MosaicId } from '../../src/model/mosaic'; -import { MosaicNonce } from '../../src/model/mosaic'; -import { AliasAction } from '../../src/model/namespace'; -import { NamespaceId } from '../../src/model/namespace'; +import { MosaicFlags, MosaicId, MosaicNonce } from '../../src/model/mosaic'; +import { AliasAction, NamespaceId } from '../../src/model/namespace'; import { NetworkType } from '../../src/model/network/NetworkType'; import { MosaicRestrictionType } from '../../src/model/restriction/MosaicRestrictionType'; import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction'; diff --git a/e2e/service/AccountService.spec.ts b/e2e/service/AccountService.spec.ts index de832a187a..658b826cfb 100644 --- a/e2e/service/AccountService.spec.ts +++ b/e2e/service/AccountService.spec.ts @@ -16,13 +16,13 @@ import { expect } from 'chai'; import { Account } from '../../src/model/account/Account'; +import { NamespaceId } from '../../src/model/namespace/NamespaceId'; import { NetworkType } from '../../src/model/network/NetworkType'; import { Deadline } from '../../src/model/transaction/Deadline'; +import { NamespaceRegistrationTransaction } from '../../src/model/transaction/NamespaceRegistrationTransaction'; import { UInt64 } from '../../src/model/UInt64'; -import { IntegrationTestHelper } from '../infrastructure/IntegrationTestHelper'; import { AccountService } from '../../src/service/AccountService'; -import { NamespaceRegistrationTransaction } from '../../src/model/transaction/NamespaceRegistrationTransaction'; -import { NamespaceId } from '../../src/model/namespace/NamespaceId'; +import { IntegrationTestHelper } from '../infrastructure/IntegrationTestHelper'; describe('AccountService', () => { const helper = new IntegrationTestHelper(); diff --git a/e2e/service/BlockService.spec.ts b/e2e/service/BlockService.spec.ts index 24ff7db92a..18e5faaf0e 100644 --- a/e2e/service/BlockService.spec.ts +++ b/e2e/service/BlockService.spec.ts @@ -15,20 +15,20 @@ */ import { assert, expect } from 'chai'; +import { BlockRepository } from '../../src/infrastructure/BlockRepository'; import { ReceiptRepository } from '../../src/infrastructure/ReceiptRepository'; +import { TransactionGroup } from '../../src/infrastructure/TransactionGroup'; import { TransactionRepository } from '../../src/infrastructure/TransactionRepository'; import { Account } from '../../src/model/account/Account'; import { PlainMessage } from '../../src/model/message/PlainMessage'; import { NetworkType } from '../../src/model/network/NetworkType'; +import { TransactionStatement } from '../../src/model/receipt/TransactionStatement'; import { Deadline } from '../../src/model/transaction/Deadline'; import { TransferTransaction } from '../../src/model/transaction/TransferTransaction'; import { UInt64 } from '../../src/model/UInt64'; import { BlockService } from '../../src/service/BlockService'; import { NetworkCurrencyLocal } from '../../test/model/mosaic/Currency.spec'; import { IntegrationTestHelper } from '../infrastructure/IntegrationTestHelper'; -import { TransactionGroup } from '../../src/infrastructure/TransactionGroup'; -import { TransactionStatement } from '../../src/model/receipt/TransactionStatement'; -import { BlockRepository } from '../../src/infrastructure/BlockRepository'; describe('BlockService', () => { const helper = new IntegrationTestHelper(); diff --git a/e2e/service/CurrencyService.spec.ts b/e2e/service/CurrencyService.spec.ts index 2857bde035..d412dafd91 100644 --- a/e2e/service/CurrencyService.spec.ts +++ b/e2e/service/CurrencyService.spec.ts @@ -15,7 +15,7 @@ */ import { expect } from 'chai'; -import { MosaicFlags, MosaicId, MosaicNonce, Currency } from '../../src/model/mosaic'; +import { Currency, MosaicFlags, MosaicId, MosaicNonce } from '../../src/model/mosaic'; import { Deadline } from '../../src/model/transaction/Deadline'; import { MosaicDefinitionTransaction } from '../../src/model/transaction/MosaicDefinitionTransaction'; import { UInt64 } from '../../src/model/UInt64'; diff --git a/e2e/service/TransactionService.spec.ts b/e2e/service/TransactionService.spec.ts index 9824965401..74d99d3e90 100644 --- a/e2e/service/TransactionService.spec.ts +++ b/e2e/service/TransactionService.spec.ts @@ -17,16 +17,10 @@ import { assert, expect } from 'chai'; import { Convert } from '../../src/core/format'; import { TransactionRepository } from '../../src/infrastructure/TransactionRepository'; -import { Account } from '../../src/model/account'; -import { Address } from '../../src/model/account'; +import { Account, Address } from '../../src/model/account'; import { PlainMessage } from '../../src/model/message/PlainMessage'; -import { Mosaic } from '../../src/model/mosaic'; -import { MosaicFlags } from '../../src/model/mosaic'; -import { MosaicId } from '../../src/model/mosaic'; -import { MosaicNonce } from '../../src/model/mosaic'; -import { MosaicSupplyChangeAction } from '../../src/model/mosaic'; -import { AliasAction } from '../../src/model/namespace'; -import { NamespaceId } from '../../src/model/namespace'; +import { Mosaic, MosaicFlags, MosaicId, MosaicNonce, MosaicSupplyChangeAction } from '../../src/model/mosaic'; +import { AliasAction, NamespaceId } from '../../src/model/namespace'; import { NetworkType } from '../../src/model/network/NetworkType'; import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction'; diff --git a/e2e/service/TransactionService_AggregateBonded.spec.ts b/e2e/service/TransactionService_AggregateBonded.spec.ts index bc14c65c38..58adec9047 100644 --- a/e2e/service/TransactionService_AggregateBonded.spec.ts +++ b/e2e/service/TransactionService_AggregateBonded.spec.ts @@ -14,10 +14,9 @@ * limitations under the License. */ -import { expect } from 'chai'; import { ChronoUnit } from '@js-joda/core'; -import { Account } from '../../src/model/account'; -import { Address } from '../../src/model/account'; +import { expect } from 'chai'; +import { Account, Address } from '../../src/model/account'; import { PlainMessage } from '../../src/model/message/PlainMessage'; import { NetworkType } from '../../src/model/network/NetworkType'; import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction'; diff --git a/package-lock.json b/package-lock.json index 088665e790..e05630d54d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6159,7 +6159,7 @@ }, "which-module": { "version": "2.0.0", - "resolved": "", + "resolved": false, "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, @@ -6701,6 +6701,12 @@ "fast-diff": "^1.1.2" } }, + "prettier-plugin-organize-imports": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-1.1.1.tgz", + "integrity": "sha512-rFA1lnek1FYkMGthm4xBKME41qUKItTovuo24bCGZu/Vu1n3gW71UPLAkIdwewwkZCe29gRVweSOPXvAdckFuw==", + "dev": true + }, "pretty-hrtime": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", diff --git a/package.json b/package.json index 1629d909d9..33ec08adaa 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "prettier": "prettier --write ./src ./test ./e2e", "lint": "eslint --cache src/ test/ e2e/ --ext .ts", "lint:fix": "eslint src/ test/ e2e/ --ext .ts --fix", - "style:fix": "npm run prettier && npm run lint:fix", + "style:fix": "npm run create-index-files && npm run prettier && npm run lint:fix", "create-index-files": "cti create ./src -b -n", "doc": "typedoc --out \"ts-docs/$(npm run version --silent)\" src", "bootstrap-clean": "symbol-bootstrap clean -t target/bootstrap-test", @@ -84,6 +84,7 @@ "nyc": "^15.1.0", "pre-commit": "^1.2.2", "prettier": "^2.1.2", + "prettier-plugin-organize-imports": "^1.1.1", "secure-random": "^1.1.2", "shx": "^0.3.2", "symbol-bootstrap": "^0.2.0", diff --git a/src/core/crypto/Crypto.ts b/src/core/crypto/Crypto.ts index be332aca0b..39ae091155 100644 --- a/src/core/crypto/Crypto.ts +++ b/src/core/crypto/Crypto.ts @@ -14,11 +14,11 @@ * limitations under the License. */ +import * as crypto from 'crypto'; +import * as CryptoJS from 'crypto-js'; import { Convert as convert } from '../format/Convert'; import { KeyPair } from './KeyPair'; import * as utility from './Utilities'; -import * as crypto from 'crypto'; -import * as CryptoJS from 'crypto-js'; export class Crypto { private static AES_ALGO = 'aes-256-gcm'; diff --git a/src/core/crypto/Utilities.ts b/src/core/crypto/Utilities.ts index d9a6898cd0..11eab51562 100644 --- a/src/core/crypto/Utilities.ts +++ b/src/core/crypto/Utilities.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import { RawArray as array } from '../format'; -import * as nacl from './nacl_catapult'; import * as CryptoJS from 'crypto-js'; +import { WordArray } from 'crypto-js'; import * as hkdf from 'futoin-hkdf'; import { sha512 } from 'js-sha512'; -import { WordArray } from 'crypto-js'; +import { RawArray as array } from '../format'; +import * as nacl from './nacl_catapult'; export const Key_Size = 32; export const Signature_Size = 64; diff --git a/src/core/crypto/index.ts b/src/core/crypto/index.ts index 028be718aa..602892ecce 100644 --- a/src/core/crypto/index.ts +++ b/src/core/crypto/index.ts @@ -3,6 +3,6 @@ export * from './Crypto'; export * from './KeyPair'; export * from './MerkleHashBuilder'; +export * from './nacl_catapult'; export * from './SHA3Hasher'; export * from './Utilities'; -export * from './nacl_catapult'; diff --git a/src/core/utils/LockHashUtils.ts b/src/core/utils/LockHashUtils.ts index d4a7baf23c..8b729e582d 100644 --- a/src/core/utils/LockHashUtils.ts +++ b/src/core/utils/LockHashUtils.ts @@ -14,10 +14,10 @@ * limitations under the License. */ +import { sha256 } from 'js-sha256'; import { sha3_256 } from 'js-sha3'; -import { LockHashAlgorithm } from '../../model/lock/LockHashAlgorithm'; import * as ripemd160 from 'ripemd160'; -import { sha256 } from 'js-sha256'; +import { LockHashAlgorithm } from '../../model/lock/LockHashAlgorithm'; /** * Hash utilities for SecretLock hashing */ diff --git a/src/core/utils/UnresolvedMapping.ts b/src/core/utils/UnresolvedMapping.ts index 046c59f842..8249dbbd7e 100644 --- a/src/core/utils/UnresolvedMapping.ts +++ b/src/core/utils/UnresolvedMapping.ts @@ -14,13 +14,13 @@ * limitations under the License. */ import { Address } from '../../model/account/Address'; +import { UnresolvedAddress } from '../../model/account/UnresolvedAddress'; import { MosaicId } from '../../model/mosaic/MosaicId'; +import { UnresolvedMosaicId } from '../../model/mosaic/UnresolvedMosaicId'; import { NamespaceId } from '../../model/namespace/NamespaceId'; import { NetworkType } from '../../model/network/NetworkType'; import { Convert } from '../format/Convert'; import { RawAddress } from '../format/RawAddress'; -import { UnresolvedAddress } from '../../model/account/UnresolvedAddress'; -import { UnresolvedMosaicId } from '../../model/mosaic/UnresolvedMosaicId'; /** * @internal diff --git a/src/infrastructure/AccountHttp.ts b/src/infrastructure/AccountHttp.ts index b0ba660591..2bc13536b6 100644 --- a/src/infrastructure/AccountHttp.ts +++ b/src/infrastructure/AccountHttp.ts @@ -16,20 +16,20 @@ import { Observable } from 'rxjs'; import { AccountInfoDTO, AccountRoutesApi } from 'symbol-openapi-typescript-fetch-client'; +import { DtoMapping } from '../core/utils/DtoMapping'; import { AccountInfo } from '../model/account/AccountInfo'; +import { AccountLinkPublicKey } from '../model/account/AccountLinkPublicKey'; +import { AccountLinkVotingKey } from '../model/account/AccountLinkVotingKey'; import { ActivityBucket } from '../model/account/ActivityBucket'; import { Address } from '../model/account/Address'; +import { SupplementalPublicKeys } from '../model/account/SupplementalPublicKeys'; import { Mosaic } from '../model/mosaic/Mosaic'; import { MosaicId } from '../model/mosaic/MosaicId'; import { UInt64 } from '../model/UInt64'; import { AccountRepository } from './AccountRepository'; import { Http } from './Http'; -import { SupplementalPublicKeys } from '../model/account/SupplementalPublicKeys'; -import { AccountLinkPublicKey } from '../model/account/AccountLinkPublicKey'; -import { AccountLinkVotingKey } from '../model/account/AccountLinkVotingKey'; -import { AccountSearchCriteria } from './searchCriteria/AccountSearchCriteria'; -import { DtoMapping } from '../core/utils/DtoMapping'; import { Page } from './Page'; +import { AccountSearchCriteria } from './searchCriteria/AccountSearchCriteria'; /** * Account http repository. diff --git a/src/infrastructure/ChainHttp.ts b/src/infrastructure/ChainHttp.ts index db0cbb6dba..2349900812 100644 --- a/src/infrastructure/ChainHttp.ts +++ b/src/infrastructure/ChainHttp.ts @@ -15,12 +15,12 @@ */ import { Observable } from 'rxjs'; -import { ChainRoutesApi, ChainInfoDTO } from 'symbol-openapi-typescript-fetch-client'; +import { ChainInfoDTO, ChainRoutesApi } from 'symbol-openapi-typescript-fetch-client'; import { ChainInfo } from '../model/blockchain/ChainInfo'; +import { FinalizedBlock } from '../model/blockchain/FinalizedBlock'; import { UInt64 } from '../model/UInt64'; import { ChainRepository } from './ChainRepository'; import { Http } from './Http'; -import { FinalizedBlock } from '../model/blockchain/FinalizedBlock'; /** * Chian http repository. diff --git a/src/infrastructure/FinalizationHttp.ts b/src/infrastructure/FinalizationHttp.ts index da9768dc7e..55a0c65260 100644 --- a/src/infrastructure/FinalizationHttp.ts +++ b/src/infrastructure/FinalizationHttp.ts @@ -16,13 +16,13 @@ import { Observable } from 'rxjs'; import { FinalizationProofDTO, FinalizationRoutesApi } from 'symbol-openapi-typescript-fetch-client'; +import { BmTreeSignature } from '../model/finalization/BmTreeSignature'; import { FinalizationProof } from '../model/finalization/FinalizationProof'; +import { MessageGroup } from '../model/finalization/MessageGroup'; +import { ParentPublicKeySignaturePair } from '../model/finalization/ParentPublicKeySignaturePair'; import { UInt64 } from '../model/UInt64'; import { FinalizationRepository } from './FinalizationRepository'; import { Http } from './Http'; -import { MessageGroup } from '../model/finalization/MessageGroup'; -import { BmTreeSignature } from '../model/finalization/BmTreeSignature'; -import { ParentPublicKeySignaturePair } from '../model/finalization/ParentPublicKeySignaturePair'; /** * Chian http repository. diff --git a/src/infrastructure/HashLockHttp.ts b/src/infrastructure/HashLockHttp.ts index e0e4af4343..2504a49cdd 100644 --- a/src/infrastructure/HashLockHttp.ts +++ b/src/infrastructure/HashLockHttp.ts @@ -15,15 +15,15 @@ */ import { Observable } from 'rxjs'; -import { HashLockRoutesApi, HashLockInfoDTO } from 'symbol-openapi-typescript-fetch-client'; +import { HashLockInfoDTO, HashLockRoutesApi } from 'symbol-openapi-typescript-fetch-client'; +import { DtoMapping } from '../core/utils/DtoMapping'; import { Address } from '../model/account/Address'; +import { HashLockInfo } from '../model/lock/HashLockInfo'; import { MosaicId } from '../model/mosaic/MosaicId'; import { UInt64 } from '../model/UInt64'; +import { HashLockRepository } from './HashLockRepository'; import { Http } from './Http'; -import { DtoMapping } from '../core/utils/DtoMapping'; import { Page } from './Page'; -import { HashLockRepository } from './HashLockRepository'; -import { HashLockInfo } from '../model/lock/HashLockInfo'; import { HashLockSearchCriteria } from './searchCriteria/HashLockSearchCriteria'; /** diff --git a/src/infrastructure/HashLockRepository.ts b/src/infrastructure/HashLockRepository.ts index eaf93cc8d0..19996f2a86 100644 --- a/src/infrastructure/HashLockRepository.ts +++ b/src/infrastructure/HashLockRepository.ts @@ -15,8 +15,8 @@ */ import { Observable } from 'rxjs'; -import { Searcher } from './paginationStreamer/Searcher'; import { HashLockInfo } from '../model/lock/HashLockInfo'; +import { Searcher } from './paginationStreamer/Searcher'; import { HashLockSearchCriteria } from './searchCriteria/HashLockSearchCriteria'; /** diff --git a/src/infrastructure/Http.ts b/src/infrastructure/Http.ts index f10d4fea3c..08568e9a25 100644 --- a/src/infrastructure/Http.ts +++ b/src/infrastructure/Http.ts @@ -14,13 +14,13 @@ * limitations under the License. */ -import { from as observableFrom, Observable, of, of as observableOf, throwError } from 'rxjs'; +import fetch from 'node-fetch'; +import { from as observableFrom, Observable, of as observableOf, of, throwError } from 'rxjs'; import { catchError, flatMap, map } from 'rxjs/operators'; import { Configuration, NodeRoutesApi, Pagination, querystring } from 'symbol-openapi-typescript-fetch-client'; import { NetworkType } from '../model/network/NetworkType'; import { Page } from './Page'; import { RepositoryCallError } from './RepositoryCallError'; -import fetch from 'node-fetch'; /** * Http extended by all http services diff --git a/src/infrastructure/IListener.ts b/src/infrastructure/IListener.ts index 910b441172..7180dc5216 100644 --- a/src/infrastructure/IListener.ts +++ b/src/infrastructure/IListener.ts @@ -16,12 +16,12 @@ import { Observable } from 'rxjs'; import { Address } from '../model/account/Address'; +import { FinalizedBlock } from '../model/blockchain/FinalizedBlock'; import { NewBlock } from '../model/blockchain/NewBlock'; import { AggregateTransaction } from '../model/transaction/AggregateTransaction'; import { CosignatureSignedTransaction } from '../model/transaction/CosignatureSignedTransaction'; import { Transaction } from '../model/transaction/Transaction'; import { TransactionStatusError } from '../model/transaction/TransactionStatusError'; -import { FinalizedBlock } from '../model/blockchain/FinalizedBlock'; /** * Listener service diff --git a/src/infrastructure/Listener.ts b/src/infrastructure/Listener.ts index c5ee5ab2c4..18a29508c2 100644 --- a/src/infrastructure/Listener.ts +++ b/src/infrastructure/Listener.ts @@ -20,6 +20,7 @@ import { BlockInfoDTO } from 'symbol-openapi-typescript-fetch-client'; import * as WebSocket from 'ws'; import { Address } from '../model/account/Address'; import { PublicAccount } from '../model/account/PublicAccount'; +import { FinalizedBlock } from '../model/blockchain/FinalizedBlock'; import { NewBlock } from '../model/blockchain/NewBlock'; import { NamespaceName } from '../model/namespace/NamespaceName'; import { AggregateTransaction } from '../model/transaction/AggregateTransaction'; @@ -31,7 +32,6 @@ import { UInt64 } from '../model/UInt64'; import { IListener } from './IListener'; import { NamespaceRepository } from './NamespaceRepository'; import { CreateTransactionFromDTO } from './transaction/CreateTransactionFromDTO'; -import { FinalizedBlock } from '../model/blockchain/FinalizedBlock'; export enum ListenerChannelName { block = 'block', diff --git a/src/infrastructure/MetadataHttp.ts b/src/infrastructure/MetadataHttp.ts index b243e6c803..18327246e5 100644 --- a/src/infrastructure/MetadataHttp.ts +++ b/src/infrastructure/MetadataHttp.ts @@ -15,8 +15,9 @@ */ import { Observable } from 'rxjs'; -import { MetadataRoutesApi, MetadataInfoDTO } from 'symbol-openapi-typescript-fetch-client'; +import { MetadataInfoDTO, MetadataRoutesApi } from 'symbol-openapi-typescript-fetch-client'; import { Convert } from '../core/format/Convert'; +import { DtoMapping } from '../core/utils/DtoMapping'; import { Address } from '../model/account/Address'; import { Metadata } from '../model/metadata/Metadata'; import { MetadataEntry } from '../model/metadata/MetadataEntry'; @@ -25,10 +26,9 @@ import { MosaicId } from '../model/mosaic/MosaicId'; import { NamespaceId } from '../model/namespace/NamespaceId'; import { UInt64 } from '../model/UInt64'; import { Http } from './Http'; -import { MetadataSearchCriteria } from './searchCriteria/MetadataSearchCriteria'; -import { Page } from './Page'; -import { DtoMapping } from '../core/utils/DtoMapping'; import { MetadataRepository } from './MetadataRepository'; +import { Page } from './Page'; +import { MetadataSearchCriteria } from './searchCriteria/MetadataSearchCriteria'; /** * Metadata http repository. diff --git a/src/infrastructure/NamespaceHttp.ts b/src/infrastructure/NamespaceHttp.ts index 60672af5e8..672a30d8e4 100644 --- a/src/infrastructure/NamespaceHttp.ts +++ b/src/infrastructure/NamespaceHttp.ts @@ -17,6 +17,7 @@ import { Observable } from 'rxjs'; import { mergeMap } from 'rxjs/operators'; import { NamespaceDTO, NamespaceInfoDTO, NamespaceRoutesApi } from 'symbol-openapi-typescript-fetch-client'; import { Convert as convert, RawAddress as AddressLibrary } from '../core/format'; +import { DtoMapping } from '../core/utils/DtoMapping'; import { AccountNames } from '../model/account/AccountNames'; import { Address } from '../model/account/Address'; import { MosaicId } from '../model/mosaic/MosaicId'; @@ -33,9 +34,8 @@ import { NetworkType } from '../model/network/NetworkType'; import { UInt64 } from '../model/UInt64'; import { Http } from './Http'; import { NamespaceRepository } from './NamespaceRepository'; -import { NamespaceSearchCriteria } from './searchCriteria/NamespaceSearchCriteria'; import { Page } from './Page'; -import { DtoMapping } from '../core/utils/DtoMapping'; +import { NamespaceSearchCriteria } from './searchCriteria/NamespaceSearchCriteria'; /** * Namespace http repository. diff --git a/src/infrastructure/ReceiptHttp.ts b/src/infrastructure/ReceiptHttp.ts index 4f7d935141..4f3955ed4d 100644 --- a/src/infrastructure/ReceiptHttp.ts +++ b/src/infrastructure/ReceiptHttp.ts @@ -17,17 +17,17 @@ import { Observable } from 'rxjs'; import { ReceiptRoutesApi } from 'symbol-openapi-typescript-fetch-client'; import { DtoMapping } from '../core/utils/DtoMapping'; +import { AddressResolutionStatement, MosaicIdResolutionStatement } from '../model/receipt/ResolutionStatement'; +import { TransactionStatement } from '../model/receipt/TransactionStatement'; import { Http } from './Http'; -import { ReceiptRepository } from './ReceiptRepository'; -import { ResolutionStatementSearchCriteria } from './searchCriteria/ResolutionStatementSearchCriteria'; import { Page } from './Page'; -import { TransactionStatement } from '../model/receipt/TransactionStatement'; -import { AddressResolutionStatement, MosaicIdResolutionStatement } from '../model/receipt/ResolutionStatement'; import { createAddressResolutionStatement, createMosaicResolutionStatement, createTransactionStatement, } from './receipt/CreateReceiptFromDTO'; +import { ReceiptRepository } from './ReceiptRepository'; +import { ResolutionStatementSearchCriteria } from './searchCriteria/ResolutionStatementSearchCriteria'; import { TransactionStatementSearchCriteria } from './searchCriteria/TransactionStatementSearchCriteria'; /** diff --git a/src/infrastructure/ReceiptRepository.ts b/src/infrastructure/ReceiptRepository.ts index c3c2f8c303..c75eceebd9 100644 --- a/src/infrastructure/ReceiptRepository.ts +++ b/src/infrastructure/ReceiptRepository.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import { ResolutionStatementSearchCriteria } from './searchCriteria/ResolutionStatementSearchCriteria'; -import { TransactionStatement } from '../model/receipt/TransactionStatement'; -import { AddressResolutionStatement, MosaicIdResolutionStatement } from '../model/receipt/ResolutionStatement'; import { Observable } from 'rxjs'; +import { AddressResolutionStatement, MosaicIdResolutionStatement } from '../model/receipt/ResolutionStatement'; +import { TransactionStatement } from '../model/receipt/TransactionStatement'; import { Page } from './Page'; +import { ResolutionStatementSearchCriteria } from './searchCriteria/ResolutionStatementSearchCriteria'; import { TransactionStatementSearchCriteria } from './searchCriteria/TransactionStatementSearchCriteria'; /** diff --git a/src/infrastructure/RepositoryFactory.ts b/src/infrastructure/RepositoryFactory.ts index d3dcc09736..0d2f341545 100644 --- a/src/infrastructure/RepositoryFactory.ts +++ b/src/infrastructure/RepositoryFactory.ts @@ -20,6 +20,8 @@ import { NetworkType } from '../model/network/NetworkType'; import { AccountRepository } from './AccountRepository'; import { BlockRepository } from './BlockRepository'; import { ChainRepository } from './ChainRepository'; +import { FinalizationRepository } from './FinalizationRepository'; +import { HashLockRepository } from './HashLockRepository'; import { IListener } from './IListener'; import { MetadataRepository } from './MetadataRepository'; import { MosaicRepository } from './MosaicRepository'; @@ -30,11 +32,9 @@ import { NodeRepository } from './NodeRepository'; import { ReceiptRepository } from './ReceiptRepository'; import { RestrictionAccountRepository } from './RestrictionAccountRepository'; import { RestrictionMosaicRepository } from './RestrictionMosaicRepository'; +import { SecretLockRepository } from './SecretLockRepository'; import { TransactionRepository } from './TransactionRepository'; import { TransactionStatusRepository } from './TransactionStatusRepository'; -import { HashLockRepository } from './HashLockRepository'; -import { SecretLockRepository } from './SecretLockRepository'; -import { FinalizationRepository } from './FinalizationRepository'; /** * A repository factory allows clients to create repositories to access NEM Server without knowing diff --git a/src/infrastructure/RepositoryFactoryHttp.ts b/src/infrastructure/RepositoryFactoryHttp.ts index fa8e7d2e1f..67fd18d4b4 100644 --- a/src/infrastructure/RepositoryFactoryHttp.ts +++ b/src/infrastructure/RepositoryFactoryHttp.ts @@ -16,6 +16,7 @@ import { defer, Observable, of as observableOf } from 'rxjs'; import { map, shareReplay } from 'rxjs/operators'; +import { DtoMapping } from '../core/utils/DtoMapping'; import { NetworkCurrencies } from '../model/mosaic'; import { NetworkConfiguration } from '../model/network/NetworkConfiguration'; import { NetworkType } from '../model/network/NetworkType'; @@ -26,6 +27,10 @@ import { BlockHttp } from './BlockHttp'; import { BlockRepository } from './BlockRepository'; import { ChainHttp } from './ChainHttp'; import { ChainRepository } from './ChainRepository'; +import { FinalizationHttp } from './FinalizationHttp'; +import { FinalizationRepository } from './FinalizationRepository'; +import { HashLockHttp } from './HashLockHttp'; +import { HashLockRepository } from './HashLockRepository'; import { IListener } from './IListener'; import { Listener } from './Listener'; import { MetadataHttp } from './MetadataHttp'; @@ -48,17 +53,12 @@ import { RestrictionAccountHttp } from './RestrictionAccountHttp'; import { RestrictionAccountRepository } from './RestrictionAccountRepository'; import { RestrictionMosaicHttp } from './RestrictionMosaicHttp'; import { RestrictionMosaicRepository } from './RestrictionMosaicRepository'; +import { SecretLockHttp } from './SecretLockHttp'; +import { SecretLockRepository } from './SecretLockRepository'; import { TransactionHttp } from './TransactionHttp'; import { TransactionRepository } from './TransactionRepository'; import { TransactionStatusHttp } from './TransactionStatusHttp'; import { TransactionStatusRepository } from './TransactionStatusRepository'; -import { HashLockRepository } from './HashLockRepository'; -import { SecretLockRepository } from './SecretLockRepository'; -import { SecretLockHttp } from './SecretLockHttp'; -import { HashLockHttp } from './HashLockHttp'; -import { DtoMapping } from '../core/utils/DtoMapping'; -import { FinalizationHttp } from './FinalizationHttp'; -import { FinalizationRepository } from './FinalizationRepository'; /** * Receipt http repository. * diff --git a/src/infrastructure/RestrictionMosaicHttp.ts b/src/infrastructure/RestrictionMosaicHttp.ts index 093386ab30..763cc27970 100644 --- a/src/infrastructure/RestrictionMosaicHttp.ts +++ b/src/infrastructure/RestrictionMosaicHttp.ts @@ -20,16 +20,16 @@ import { MosaicGlobalRestrictionDTO, RestrictionMosaicRoutesApi, } from 'symbol-openapi-typescript-fetch-client'; +import { DtoMapping } from '../core/utils/DtoMapping'; import { Address } from '../model/account/Address'; import { MosaicId } from '../model/mosaic/MosaicId'; import { MosaicAddressRestriction } from '../model/restriction/MosaicAddressRestriction'; import { MosaicGlobalRestriction } from '../model/restriction/MosaicGlobalRestriction'; import { MosaicGlobalRestrictionItem } from '../model/restriction/MosaicGlobalRestrictionItem'; import { Http } from './Http'; +import { Page } from './Page'; import { RestrictionMosaicRepository } from './RestrictionMosaicRepository'; import { RestrictionMosaicSearchCriteria } from './searchCriteria/RestrictionMosaicSearchCriteria'; -import { DtoMapping } from '../core/utils/DtoMapping'; -import { Page } from './Page'; /** * RestrictionMosaic http repository. diff --git a/src/infrastructure/RestrictionMosaicRepository.ts b/src/infrastructure/RestrictionMosaicRepository.ts index 8a8fc2577e..c5887d8cc3 100644 --- a/src/infrastructure/RestrictionMosaicRepository.ts +++ b/src/infrastructure/RestrictionMosaicRepository.ts @@ -17,8 +17,8 @@ import { Observable } from 'rxjs/internal/Observable'; import { MosaicAddressRestriction } from '../model/restriction/MosaicAddressRestriction'; import { MosaicGlobalRestriction } from '../model/restriction/MosaicGlobalRestriction'; -import { RestrictionMosaicSearchCriteria } from './searchCriteria/RestrictionMosaicSearchCriteria'; import { Page } from './Page'; +import { RestrictionMosaicSearchCriteria } from './searchCriteria/RestrictionMosaicSearchCriteria'; export interface RestrictionMosaicRepository { /** diff --git a/src/infrastructure/SecretLockHttp.ts b/src/infrastructure/SecretLockHttp.ts index 1498f5d446..e887f007f1 100644 --- a/src/infrastructure/SecretLockHttp.ts +++ b/src/infrastructure/SecretLockHttp.ts @@ -15,16 +15,16 @@ */ import { Observable } from 'rxjs'; -import { SecretLockRoutesApi, SecretLockInfoDTO } from 'symbol-openapi-typescript-fetch-client'; +import { SecretLockInfoDTO, SecretLockRoutesApi } from 'symbol-openapi-typescript-fetch-client'; +import { DtoMapping } from '../core/utils/DtoMapping'; import { Address } from '../model/account/Address'; +import { SecretLockInfo } from '../model/lock/SecretLockInfo'; import { MosaicId } from '../model/mosaic/MosaicId'; import { UInt64 } from '../model/UInt64'; import { Http } from './Http'; -import { DtoMapping } from '../core/utils/DtoMapping'; import { Page } from './Page'; -import { SecretLockRepository } from './SecretLockRepository'; -import { SecretLockInfo } from '../model/lock/SecretLockInfo'; import { SecretLockSearchCriteria } from './searchCriteria/SecretLockSearchCriteria'; +import { SecretLockRepository } from './SecretLockRepository'; /** * SecretLock http repository. diff --git a/src/infrastructure/SecretLockRepository.ts b/src/infrastructure/SecretLockRepository.ts index 578dff6233..aec30d28fa 100644 --- a/src/infrastructure/SecretLockRepository.ts +++ b/src/infrastructure/SecretLockRepository.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { Searcher } from './paginationStreamer/Searcher'; import { SecretLockInfo } from '../model/lock/SecretLockInfo'; +import { Searcher } from './paginationStreamer/Searcher'; import { SecretLockSearchCriteria } from './searchCriteria/SecretLockSearchCriteria'; /** diff --git a/src/infrastructure/index.ts b/src/infrastructure/index.ts index 8e00d39b22..5f8af2ce4c 100644 --- a/src/infrastructure/index.ts +++ b/src/infrastructure/index.ts @@ -1,15 +1,13 @@ // created from 'create-ts-index' -export * from './paginationStreamer'; -export * from './receipt'; -export * from './searchCriteria'; -export * from './transaction'; export * from './AccountHttp'; export * from './AccountRepository'; export * from './BlockHttp'; export * from './BlockRepository'; export * from './ChainHttp'; export * from './ChainRepository'; +export * from './FinalizationHttp'; +export * from './FinalizationRepository'; export * from './HashLockHttp'; export * from './HashLockRepository'; export * from './Http'; @@ -28,6 +26,8 @@ export * from './NetworkRepository'; export * from './NodeHttp'; export * from './NodeRepository'; export * from './Page'; +export * from './paginationStreamer'; +export * from './receipt'; export * from './ReceiptHttp'; export * from './ReceiptRepository'; export * from './RepositoryCallError'; @@ -38,8 +38,10 @@ export * from './RestrictionAccountHttp'; export * from './RestrictionAccountRepository'; export * from './RestrictionMosaicHttp'; export * from './RestrictionMosaicRepository'; +export * from './searchCriteria'; export * from './SecretLockHttp'; export * from './SecretLockRepository'; +export * from './transaction'; export * from './TransactionGroup'; export * from './TransactionHttp'; export * from './TransactionRepository'; diff --git a/src/infrastructure/paginationStreamer/AccountPaginationStreamer.ts b/src/infrastructure/paginationStreamer/AccountPaginationStreamer.ts index ad1e80bff0..ed983013a9 100644 --- a/src/infrastructure/paginationStreamer/AccountPaginationStreamer.ts +++ b/src/infrastructure/paginationStreamer/AccountPaginationStreamer.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import { PaginationStreamer } from './PaginationStreamer'; -import { Searcher } from './Searcher'; import { AccountInfo } from '../../model/account/AccountInfo'; import { AccountSearchCriteria } from '../searchCriteria/AccountSearchCriteria'; +import { PaginationStreamer } from './PaginationStreamer'; +import { Searcher } from './Searcher'; /** * A helper object that streams {@link AccountInfo} using the search. diff --git a/src/infrastructure/paginationStreamer/HashLockPaginationStreamer.ts b/src/infrastructure/paginationStreamer/HashLockPaginationStreamer.ts index 5ae90ec4f1..b3a42dcf0c 100644 --- a/src/infrastructure/paginationStreamer/HashLockPaginationStreamer.ts +++ b/src/infrastructure/paginationStreamer/HashLockPaginationStreamer.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import { PaginationStreamer } from './PaginationStreamer'; -import { Searcher } from './Searcher'; import { HashLockInfo } from '../../model/lock/HashLockInfo'; import { HashLockSearchCriteria } from '../searchCriteria/HashLockSearchCriteria'; +import { PaginationStreamer } from './PaginationStreamer'; +import { Searcher } from './Searcher'; /** * A helper object that streams {@link HashLockInfo} using the search. diff --git a/src/infrastructure/paginationStreamer/MetadataPaginationStreamer.ts b/src/infrastructure/paginationStreamer/MetadataPaginationStreamer.ts index b730abae2f..15d31c19aa 100644 --- a/src/infrastructure/paginationStreamer/MetadataPaginationStreamer.ts +++ b/src/infrastructure/paginationStreamer/MetadataPaginationStreamer.ts @@ -14,10 +14,10 @@ * limitations under the License. */ +import { Metadata } from '../../model/metadata/Metadata'; +import { MetadataSearchCriteria } from '../searchCriteria/MetadataSearchCriteria'; import { PaginationStreamer } from './PaginationStreamer'; import { Searcher } from './Searcher'; -import { MetadataSearchCriteria } from '../searchCriteria/MetadataSearchCriteria'; -import { Metadata } from '../../model/metadata/Metadata'; /** * A helper object that streams {@link Metadata} using the search. diff --git a/src/infrastructure/paginationStreamer/NamespacePaginationStreamer.ts b/src/infrastructure/paginationStreamer/NamespacePaginationStreamer.ts index 403a87dcf9..87f53ff35e 100644 --- a/src/infrastructure/paginationStreamer/NamespacePaginationStreamer.ts +++ b/src/infrastructure/paginationStreamer/NamespacePaginationStreamer.ts @@ -14,10 +14,10 @@ * limitations under the License. */ +import { NamespaceInfo } from '../../model/namespace/NamespaceInfo'; +import { NamespaceSearchCriteria } from '../searchCriteria/NamespaceSearchCriteria'; import { PaginationStreamer } from './PaginationStreamer'; import { Searcher } from './Searcher'; -import { NamespaceSearchCriteria } from '../searchCriteria/NamespaceSearchCriteria'; -import { NamespaceInfo } from '../../model/namespace/NamespaceInfo'; /** * A helper object that streams {@link NamespaceInfo} using the search. diff --git a/src/infrastructure/paginationStreamer/ReceiptPaginationStreamer.ts b/src/infrastructure/paginationStreamer/ReceiptPaginationStreamer.ts index 2e5a94cb11..9dfe4881f0 100644 --- a/src/infrastructure/paginationStreamer/ReceiptPaginationStreamer.ts +++ b/src/infrastructure/paginationStreamer/ReceiptPaginationStreamer.ts @@ -15,13 +15,13 @@ */ import { Observable } from 'rxjs/internal/Observable'; -import { Page } from '../Page'; -import { PaginationStreamer } from './PaginationStreamer'; -import { ResolutionStatementSearchCriteria } from '../searchCriteria/ResolutionStatementSearchCriteria'; import { AddressResolutionStatement, MosaicIdResolutionStatement } from '../../model/receipt/ResolutionStatement'; import { TransactionStatement } from '../../model/receipt/TransactionStatement'; -import { TransactionStatementSearchCriteria } from '../searchCriteria/TransactionStatementSearchCriteria'; +import { Page } from '../Page'; import { ReceiptRepository } from '../ReceiptRepository'; +import { ResolutionStatementSearchCriteria } from '../searchCriteria/ResolutionStatementSearchCriteria'; +import { TransactionStatementSearchCriteria } from '../searchCriteria/TransactionStatementSearchCriteria'; +import { PaginationStreamer } from './PaginationStreamer'; /** * A helper object that streams {@link Statement} using the search. diff --git a/src/infrastructure/paginationStreamer/RestrictionMosaicPaginationStreamer.ts b/src/infrastructure/paginationStreamer/RestrictionMosaicPaginationStreamer.ts index 25be4e5d85..da637157fd 100644 --- a/src/infrastructure/paginationStreamer/RestrictionMosaicPaginationStreamer.ts +++ b/src/infrastructure/paginationStreamer/RestrictionMosaicPaginationStreamer.ts @@ -15,12 +15,12 @@ */ import { Observable } from 'rxjs/internal/Observable'; +import { MosaicAddressRestriction } from '../../model/restriction/MosaicAddressRestriction'; +import { MosaicGlobalRestriction } from '../../model/restriction/MosaicGlobalRestriction'; import { Page } from '../Page'; -import { PaginationStreamer } from './PaginationStreamer'; import { RestrictionMosaicRepository } from '../RestrictionMosaicRepository'; import { RestrictionMosaicSearchCriteria } from '../searchCriteria/RestrictionMosaicSearchCriteria'; -import { MosaicGlobalRestriction } from '../../model/restriction/MosaicGlobalRestriction'; -import { MosaicAddressRestriction } from '../../model/restriction/MosaicAddressRestriction'; +import { PaginationStreamer } from './PaginationStreamer'; /** * A helper object that streams {@link RestrictionMosaic} using the search. diff --git a/src/infrastructure/paginationStreamer/SecretLockPaginationStreamer.ts b/src/infrastructure/paginationStreamer/SecretLockPaginationStreamer.ts index 826c099ca0..1deba7f430 100644 --- a/src/infrastructure/paginationStreamer/SecretLockPaginationStreamer.ts +++ b/src/infrastructure/paginationStreamer/SecretLockPaginationStreamer.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import { PaginationStreamer } from './PaginationStreamer'; -import { Searcher } from './Searcher'; import { SecretLockInfo } from '../../model/lock/SecretLockInfo'; import { SecretLockSearchCriteria } from '../searchCriteria/SecretLockSearchCriteria'; +import { PaginationStreamer } from './PaginationStreamer'; +import { Searcher } from './Searcher'; /** * A helper object that streams {@link SecretLockInfo} using the search. diff --git a/src/infrastructure/searchCriteria/AccountSearchCriteria.ts b/src/infrastructure/searchCriteria/AccountSearchCriteria.ts index c4d829496b..2f3be9fc3d 100644 --- a/src/infrastructure/searchCriteria/AccountSearchCriteria.ts +++ b/src/infrastructure/searchCriteria/AccountSearchCriteria.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { SearchCriteria } from './SearchCriteria'; import { MosaicId } from '../../model/mosaic/MosaicId'; import { AccountOrderBy } from './AccountOrderBy'; +import { SearchCriteria } from './SearchCriteria'; /** * Defines the params used to search blocks. With this criteria, you can sort and filter diff --git a/src/infrastructure/searchCriteria/HashLockSearchCriteria.ts b/src/infrastructure/searchCriteria/HashLockSearchCriteria.ts index 27339bfa32..2f6c2f4ed4 100644 --- a/src/infrastructure/searchCriteria/HashLockSearchCriteria.ts +++ b/src/infrastructure/searchCriteria/HashLockSearchCriteria.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { SearchCriteria } from './SearchCriteria'; import { Address } from '../../model/account/Address'; +import { SearchCriteria } from './SearchCriteria'; /** * Defines the params used to search hash lock. With this criteria, you can sort and filter diff --git a/src/infrastructure/searchCriteria/MetadataSearchCriteria.ts b/src/infrastructure/searchCriteria/MetadataSearchCriteria.ts index 29f9dd0228..4e810340a1 100644 --- a/src/infrastructure/searchCriteria/MetadataSearchCriteria.ts +++ b/src/infrastructure/searchCriteria/MetadataSearchCriteria.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import { SearchCriteria } from './SearchCriteria'; import { Address } from '../../model/account/Address'; -import { NamespaceId } from '../../model/namespace/NamespaceId'; -import { MosaicId } from '../../model/mosaic/MosaicId'; import { MetadataType } from '../../model/metadata/MetadataType'; +import { MosaicId } from '../../model/mosaic/MosaicId'; +import { NamespaceId } from '../../model/namespace/NamespaceId'; +import { SearchCriteria } from './SearchCriteria'; /** * Defines the params used to search metadata. With this criteria, you can sort and filter diff --git a/src/infrastructure/searchCriteria/NamespaceSearchCriteria.ts b/src/infrastructure/searchCriteria/NamespaceSearchCriteria.ts index 5d33fcc7cc..69cb8db184 100644 --- a/src/infrastructure/searchCriteria/NamespaceSearchCriteria.ts +++ b/src/infrastructure/searchCriteria/NamespaceSearchCriteria.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import { SearchCriteria } from './SearchCriteria'; -import { NamespaceRegistrationType } from '../../model/namespace/NamespaceRegistrationType'; -import { AliasType } from '../../model/namespace/AliasType'; import { Address } from '../../model/account/Address'; +import { AliasType } from '../../model/namespace/AliasType'; import { NamespaceId } from '../../model/namespace/NamespaceId'; +import { NamespaceRegistrationType } from '../../model/namespace/NamespaceRegistrationType'; +import { SearchCriteria } from './SearchCriteria'; /** * Defines the params used to search blocks. With this criteria, you can sort and filter diff --git a/src/infrastructure/searchCriteria/ResolutionStatementSearchCriteria.ts b/src/infrastructure/searchCriteria/ResolutionStatementSearchCriteria.ts index ccf173e0b7..76aa093a2e 100644 --- a/src/infrastructure/searchCriteria/ResolutionStatementSearchCriteria.ts +++ b/src/infrastructure/searchCriteria/ResolutionStatementSearchCriteria.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { SearchCriteria } from './SearchCriteria'; import { UInt64 } from '../../model/UInt64'; +import { SearchCriteria } from './SearchCriteria'; /** * Defines the params used to search resolution statement receipts. With this criteria, you can sort and filter diff --git a/src/infrastructure/searchCriteria/RestrictionMosaicSearchCriteria.ts b/src/infrastructure/searchCriteria/RestrictionMosaicSearchCriteria.ts index fc51a29d7b..93a5dd915e 100644 --- a/src/infrastructure/searchCriteria/RestrictionMosaicSearchCriteria.ts +++ b/src/infrastructure/searchCriteria/RestrictionMosaicSearchCriteria.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import { SearchCriteria } from './SearchCriteria'; +import { Address } from '../../model/account/Address'; import { MosaicId } from '../../model/mosaic/MosaicId'; import { MosaicRestrictionType } from '../../model/restriction/MosaicRestrictionType'; -import { Address } from '../../model/account/Address'; +import { SearchCriteria } from './SearchCriteria'; /** * Defines the params used to search mosaic restrictions. With this criteria, you can sort and filter diff --git a/src/infrastructure/searchCriteria/SecretLockSearchCriteria.ts b/src/infrastructure/searchCriteria/SecretLockSearchCriteria.ts index 20e401cc41..d1ee0dedd8 100644 --- a/src/infrastructure/searchCriteria/SecretLockSearchCriteria.ts +++ b/src/infrastructure/searchCriteria/SecretLockSearchCriteria.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { SearchCriteria } from './SearchCriteria'; import { Address } from '../../model/account/Address'; +import { SearchCriteria } from './SearchCriteria'; /** * Defines the params used to search secret lock. With this criteria, you can sort and filter diff --git a/src/infrastructure/searchCriteria/TransactionStatementSearchCriteria.ts b/src/infrastructure/searchCriteria/TransactionStatementSearchCriteria.ts index 0e4b9fb22c..8ce7913f17 100644 --- a/src/infrastructure/searchCriteria/TransactionStatementSearchCriteria.ts +++ b/src/infrastructure/searchCriteria/TransactionStatementSearchCriteria.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import { SearchCriteria } from './SearchCriteria'; -import { UInt64 } from '../../model/UInt64'; -import { ReceiptType } from '../../model/receipt/ReceiptType'; import { Address } from '../../model/account/Address'; -import { NamespaceId } from '../../model/namespace/NamespaceId'; import { MosaicId } from '../../model/mosaic/MosaicId'; +import { NamespaceId } from '../../model/namespace/NamespaceId'; +import { ReceiptType } from '../../model/receipt/ReceiptType'; +import { UInt64 } from '../../model/UInt64'; +import { SearchCriteria } from './SearchCriteria'; /** * Defines the params used to search transaction statement receipts. With this criteria, you can sort and filter diff --git a/src/model/account/AccountInfoResolvedMosaic.ts b/src/model/account/AccountInfoResolvedMosaic.ts index 10dc58c5e1..7077d2cacf 100644 --- a/src/model/account/AccountInfoResolvedMosaic.ts +++ b/src/model/account/AccountInfoResolvedMosaic.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { AccountInfo } from './AccountInfo'; import { ResolvedMosaic } from '../mosaic/ResolvedMosaic'; +import { AccountInfo } from './AccountInfo'; /** * Account info with resolved mosaic diff --git a/src/model/account/UnresolvedAddress.ts b/src/model/account/UnresolvedAddress.ts index 6b8367966b..ee851d0e86 100644 --- a/src/model/account/UnresolvedAddress.ts +++ b/src/model/account/UnresolvedAddress.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { Address } from './Address'; import { NamespaceId } from '../namespace/NamespaceId'; +import { Address } from './Address'; /** * Custom type for unresolved address diff --git a/src/model/blockchain/BlockInfo.ts b/src/model/blockchain/BlockInfo.ts index 2ce0e927d0..f767c0421d 100644 --- a/src/model/blockchain/BlockInfo.ts +++ b/src/model/blockchain/BlockInfo.ts @@ -14,10 +14,10 @@ * limitations under the License. */ +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../network/NetworkType'; import { UInt64 } from '../UInt64'; -import { Address } from '../account/Address'; /** * The block info structure describes basic information of a block. diff --git a/src/model/blockchain/NewBlock.ts b/src/model/blockchain/NewBlock.ts index dc7d230566..4c0776ab8d 100644 --- a/src/model/blockchain/NewBlock.ts +++ b/src/model/blockchain/NewBlock.ts @@ -14,10 +14,10 @@ * limitations under the License. */ +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../network/NetworkType'; import { UInt64 } from '../UInt64'; -import { Address } from '../account/Address'; /** * The block info structure describes basic information of a new gernated block (Websocket payload). diff --git a/src/model/index.ts b/src/model/index.ts index a095638bca..8531a744e5 100644 --- a/src/model/index.ts +++ b/src/model/index.ts @@ -2,6 +2,8 @@ export * from './account'; export * from './blockchain'; +export * from './finalization'; +export * from './Id'; export * from './lock'; export * from './message'; export * from './metadata'; @@ -12,6 +14,5 @@ export * from './node'; export * from './receipt'; export * from './restriction'; export * from './transaction'; -export * from './wallet'; -export * from './Id'; export * from './UInt64'; +export * from './wallet'; diff --git a/src/model/message/Message.ts b/src/model/message/Message.ts index b2eb1c0885..eeac37c4a2 100644 --- a/src/model/message/Message.ts +++ b/src/model/message/Message.ts @@ -15,8 +15,8 @@ import { Convert } from '../../core/format/Convert'; * limitations under the License. */ -import { MessageType } from './MessageType'; import { Convert } from '../../core/format/Convert'; +import { MessageType } from './MessageType'; /** * An abstract message class that serves as the base class of all message types. diff --git a/src/model/metadata/MetadataEntry.ts b/src/model/metadata/MetadataEntry.ts index 988c711048..26b144e7fa 100644 --- a/src/model/metadata/MetadataEntry.ts +++ b/src/model/metadata/MetadataEntry.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import { UInt64 } from '../UInt64'; -import { MetadataType } from './MetadataType'; import { Address } from '../account/Address'; import { MosaicId } from '../mosaic/MosaicId'; import { NamespaceId } from '../namespace/NamespaceId'; +import { UInt64 } from '../UInt64'; +import { MetadataType } from './MetadataType'; /** * A mosaic describes an instance of a mosaic definition. diff --git a/src/model/mosaic/MosaicId.ts b/src/model/mosaic/MosaicId.ts index 5bedc0a460..2c9104064d 100644 --- a/src/model/mosaic/MosaicId.ts +++ b/src/model/mosaic/MosaicId.ts @@ -15,9 +15,9 @@ */ import { Convert as convert, RawUInt64 as uint64_t } from '../../core/format'; import { NamespaceMosaicIdGenerator } from '../../infrastructure/transaction/NamespaceMosaicIdGenerator'; +import { Address } from '../account/Address'; import { Id } from '../Id'; import { MosaicNonce } from '../mosaic/MosaicNonce'; -import { Address } from '../account/Address'; /** * The mosaic id structure describes mosaic id diff --git a/src/model/mosaic/MosaicInfo.ts b/src/model/mosaic/MosaicInfo.ts index 512f4fa93e..1af1b7f45b 100644 --- a/src/model/mosaic/MosaicInfo.ts +++ b/src/model/mosaic/MosaicInfo.ts @@ -14,10 +14,10 @@ * limitations under the License. */ +import { Address } from '../account/Address'; import { UInt64 } from '../UInt64'; import { MosaicFlags } from './MosaicFlags'; import { MosaicId } from './MosaicId'; -import { Address } from '../account/Address'; /** * The mosaic info structure describes a mosaic. diff --git a/src/model/namespace/NamespaceId.ts b/src/model/namespace/NamespaceId.ts index 66a1e050c7..594f1cae6c 100644 --- a/src/model/namespace/NamespaceId.ts +++ b/src/model/namespace/NamespaceId.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Convert as convert, RawAddress, Convert } from '../../core/format'; +import { Convert as convert, Convert, RawAddress } from '../../core/format'; import { NamespaceMosaicIdGenerator } from '../../infrastructure/transaction/NamespaceMosaicIdGenerator'; import { Id } from '../Id'; import { NetworkType } from '../network/NetworkType'; diff --git a/src/model/namespace/NamespaceInfo.ts b/src/model/namespace/NamespaceInfo.ts index b5ff1b0b94..7f50b85a14 100644 --- a/src/model/namespace/NamespaceInfo.ts +++ b/src/model/namespace/NamespaceInfo.ts @@ -14,10 +14,10 @@ * limitations under the License. */ +import { Address } from '../account/Address'; import { UInt64 } from '../UInt64'; import { Alias } from './Alias'; import { NamespaceId } from './NamespaceId'; -import { Address } from '../account/Address'; /** * Object containing information of a namespace. diff --git a/src/model/receipt/ArtifactExpiryReceipt.ts b/src/model/receipt/ArtifactExpiryReceipt.ts index 7aa8d69fa2..e6d3d3b882 100644 --- a/src/model/receipt/ArtifactExpiryReceipt.ts +++ b/src/model/receipt/ArtifactExpiryReceipt.ts @@ -16,10 +16,10 @@ import { MosaicExpiryReceiptBuilder, MosaicIdDto, NamespaceExpiryReceiptBuilder, NamespaceIdDto } from 'catbuffer-typescript'; import { MosaicId } from '../mosaic/MosaicId'; +import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; import { Receipt } from './Receipt'; import { ReceiptType } from './ReceiptType'; import { ReceiptVersion } from './ReceiptVersion'; -import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; /** * Artifact Expiry: An artifact (e.g. namespace, mosaic) expired. diff --git a/src/model/receipt/BalanceChangeReceipt.ts b/src/model/receipt/BalanceChangeReceipt.ts index 6eeb24a384..4c58173ca7 100644 --- a/src/model/receipt/BalanceChangeReceipt.ts +++ b/src/model/receipt/BalanceChangeReceipt.ts @@ -14,15 +14,14 @@ * limitations under the License. */ -import { AmountDto, BalanceChangeReceiptBuilder, MosaicBuilder, MosaicIdDto } from 'catbuffer-typescript'; +import { AddressDto, AmountDto, BalanceChangeReceiptBuilder, MosaicBuilder, MosaicIdDto } from 'catbuffer-typescript'; import { Convert } from '../../core/format/Convert'; +import { Address } from '../account/Address'; import { MosaicId } from '../mosaic/MosaicId'; import { UInt64 } from '../UInt64'; import { Receipt } from './Receipt'; import { ReceiptType } from './ReceiptType'; import { ReceiptVersion } from './ReceiptVersion'; -import { Address } from '../account/Address'; -import { AddressDto } from 'catbuffer-typescript'; /** * Balance Change: A mosaic credit or debit was triggered. diff --git a/src/model/receipt/ResolutionStatement.ts b/src/model/receipt/ResolutionStatement.ts index 7c744f82a6..376c3606f1 100644 --- a/src/model/receipt/ResolutionStatement.ts +++ b/src/model/receipt/ResolutionStatement.ts @@ -29,15 +29,15 @@ import { sha3_256 } from 'js-sha3'; import { RawAddress } from '../../core/format/RawAddress'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; import { Address } from '../account/Address'; +import { UnresolvedAddress } from '../account/UnresolvedAddress'; import { MosaicId } from '../mosaic/MosaicId'; +import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; import { NetworkType } from '../network/NetworkType'; import { UInt64 } from '../UInt64'; import { ReceiptType } from './ReceiptType'; import { ReceiptVersion } from './ReceiptVersion'; import { ResolutionEntry } from './ResolutionEntry'; import { ResolutionType } from './ResolutionType'; -import { UnresolvedAddress } from '../account/UnresolvedAddress'; -import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; /** * ResolutionStatement alias for Addresses receipts. diff --git a/src/model/receipt/Statement.ts b/src/model/receipt/Statement.ts index 203ad09666..b422ff3f8b 100644 --- a/src/model/receipt/Statement.ts +++ b/src/model/receipt/Statement.ts @@ -15,14 +15,14 @@ */ import { Address } from '../account/Address'; +import { UnresolvedAddress } from '../account/UnresolvedAddress'; import { Mosaic } from '../mosaic/Mosaic'; import { MosaicId } from '../mosaic/MosaicId'; +import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; import { NamespaceId } from '../namespace/NamespaceId'; import { AddressResolutionStatement, MosaicIdResolutionStatement } from './ResolutionStatement'; import { ResolutionType } from './ResolutionType'; import { TransactionStatement } from './TransactionStatement'; -import { UnresolvedAddress } from '../account/UnresolvedAddress'; -import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; export class Statement { /** diff --git a/src/model/restriction/AccountRestriction.ts b/src/model/restriction/AccountRestriction.ts index 281ba7c46d..faeb84cb39 100644 --- a/src/model/restriction/AccountRestriction.ts +++ b/src/model/restriction/AccountRestriction.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { OperationRestrictionFlag } from './OperationRestrictionFlag'; import { AddressRestrictionFlag } from './AddressRestrictionFlag'; import { MosaicRestrictionFlag } from './MosaicRestrictionFlag'; +import { OperationRestrictionFlag } from './OperationRestrictionFlag'; /** * Account restriction structure describes restriction information. diff --git a/src/model/transaction/AccountAddressRestrictionTransaction.ts b/src/model/transaction/AccountAddressRestrictionTransaction.ts index 50751818ea..d15b616281 100644 --- a/src/model/transaction/AccountAddressRestrictionTransaction.ts +++ b/src/model/transaction/AccountAddressRestrictionTransaction.ts @@ -22,17 +22,19 @@ import { KeyDto, SignatureDto, TimestampDto, - UnresolvedAddressDto, TransactionBuilder, + UnresolvedAddressDto, } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; +import { UnresolvedAddress } from '../account/UnresolvedAddress'; import { NamespaceId } from '../namespace/NamespaceId'; import { NetworkType } from '../network/NetworkType'; import { Statement } from '../receipt/Statement'; +import { AddressRestrictionFlag } from '../restriction/AddressRestrictionFlag'; import { UInt64 } from '../UInt64'; import { Deadline } from './Deadline'; import { InnerTransaction } from './InnerTransaction'; @@ -40,8 +42,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { AddressRestrictionFlag } from '../restriction/AddressRestrictionFlag'; -import { UnresolvedAddress } from '../account/UnresolvedAddress'; export class AccountAddressRestrictionTransaction extends Transaction { /** diff --git a/src/model/transaction/AccountKeyLinkTransaction.ts b/src/model/transaction/AccountKeyLinkTransaction.ts index f6a7d5e6ae..f8aaa51677 100644 --- a/src/model/transaction/AccountKeyLinkTransaction.ts +++ b/src/model/transaction/AccountKeyLinkTransaction.ts @@ -25,6 +25,7 @@ import { TransactionBuilder, } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../network/NetworkType'; import { UInt64 } from '../UInt64'; @@ -35,7 +36,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; /** * Announce an AccountKeyLinkTransaction to delegate the account importance to a proxy account. diff --git a/src/model/transaction/AccountMetadataTransaction.ts b/src/model/transaction/AccountMetadataTransaction.ts index 58715055c6..7548f0ab61 100644 --- a/src/model/transaction/AccountMetadataTransaction.ts +++ b/src/model/transaction/AccountMetadataTransaction.ts @@ -22,11 +22,15 @@ import { KeyDto, SignatureDto, TimestampDto, - UnresolvedAddressDto, TransactionBuilder, + UnresolvedAddressDto, } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; +import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; +import { UnresolvedAddress } from '../account/UnresolvedAddress'; +import { NamespaceId } from '../namespace/NamespaceId'; import { NetworkType } from '../network/NetworkType'; import { UInt64 } from '../UInt64'; import { Deadline } from './Deadline'; @@ -35,10 +39,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; -import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; -import { NamespaceId } from '../namespace/NamespaceId'; -import { UnresolvedAddress } from '../account/UnresolvedAddress'; /** * Announce an account metadata transaction to associate a key-value state to an account. diff --git a/src/model/transaction/AccountMosaicRestrictionTransaction.ts b/src/model/transaction/AccountMosaicRestrictionTransaction.ts index 63d8d38356..f18f510ab1 100644 --- a/src/model/transaction/AccountMosaicRestrictionTransaction.ts +++ b/src/model/transaction/AccountMosaicRestrictionTransaction.ts @@ -22,15 +22,18 @@ import { KeyDto, SignatureDto, TimestampDto, - UnresolvedMosaicIdDto, TransactionBuilder, + UnresolvedMosaicIdDto, } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; +import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; import { NetworkType } from '../network/NetworkType'; import { Statement } from '../receipt/Statement'; +import { MosaicRestrictionFlag } from '../restriction/MosaicRestrictionFlag'; import { UInt64 } from '../UInt64'; import { Deadline } from './Deadline'; import { InnerTransaction } from './InnerTransaction'; @@ -38,9 +41,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; -import { MosaicRestrictionFlag } from '../restriction/MosaicRestrictionFlag'; -import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; export class AccountMosaicRestrictionTransaction extends Transaction { /** diff --git a/src/model/transaction/AccountOperationRestrictionTransaction.ts b/src/model/transaction/AccountOperationRestrictionTransaction.ts index 41ceec7258..ffcef53054 100644 --- a/src/model/transaction/AccountOperationRestrictionTransaction.ts +++ b/src/model/transaction/AccountOperationRestrictionTransaction.ts @@ -25,8 +25,10 @@ import { TransactionBuilder, } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../network/NetworkType'; +import { OperationRestrictionFlag } from '../restriction/OperationRestrictionFlag'; import { UInt64 } from '../UInt64'; import { Deadline } from './Deadline'; import { InnerTransaction } from './InnerTransaction'; @@ -34,8 +36,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; -import { OperationRestrictionFlag } from '../restriction/OperationRestrictionFlag'; export class AccountOperationRestrictionTransaction extends Transaction { /** diff --git a/src/model/transaction/AccountRestrictionTransaction.ts b/src/model/transaction/AccountRestrictionTransaction.ts index 3bb6bec660..577c397c59 100644 --- a/src/model/transaction/AccountRestrictionTransaction.ts +++ b/src/model/transaction/AccountRestrictionTransaction.ts @@ -14,19 +14,19 @@ * limitations under the License. */ +import { PublicAccount } from '../account/PublicAccount'; +import { UnresolvedAddress } from '../account/UnresolvedAddress'; +import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; import { NetworkType } from '../network/NetworkType'; +import { AddressRestrictionFlag } from '../restriction/AddressRestrictionFlag'; +import { MosaicRestrictionFlag } from '../restriction/MosaicRestrictionFlag'; +import { OperationRestrictionFlag } from '../restriction/OperationRestrictionFlag'; import { UInt64 } from '../UInt64'; import { AccountAddressRestrictionTransaction } from './AccountAddressRestrictionTransaction'; import { AccountMosaicRestrictionTransaction } from './AccountMosaicRestrictionTransaction'; import { AccountOperationRestrictionTransaction } from './AccountOperationRestrictionTransaction'; import { Deadline } from './Deadline'; import { TransactionType } from './TransactionType'; -import { PublicAccount } from '../account/PublicAccount'; -import { AddressRestrictionFlag } from '../restriction/AddressRestrictionFlag'; -import { MosaicRestrictionFlag } from '../restriction/MosaicRestrictionFlag'; -import { OperationRestrictionFlag } from '../restriction/OperationRestrictionFlag'; -import { UnresolvedAddress } from '../account/UnresolvedAddress'; -import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; export class AccountRestrictionTransaction { /** diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 57dd48246b..b840e93a07 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -32,7 +32,9 @@ import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { CreateTransactionFromPayload } from '../../infrastructure/transaction/CreateTransactionFromPayload'; import { Account } from '../account/Account'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; +import { NamespaceId } from '../namespace/NamespaceId'; import { NetworkType } from '../network/NetworkType'; import { Statement } from '../receipt/Statement'; import { UInt64 } from '../UInt64'; @@ -45,8 +47,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; -import { NamespaceId } from '../namespace/NamespaceId'; /** * Aggregate innerTransactions contain multiple innerTransactions that can be initiated by different accounts. diff --git a/src/model/transaction/AliasTransaction.ts b/src/model/transaction/AliasTransaction.ts index 92e5ef6896..e22db5107d 100644 --- a/src/model/transaction/AliasTransaction.ts +++ b/src/model/transaction/AliasTransaction.ts @@ -15,6 +15,7 @@ */ import { Address } from '../account/Address'; +import { PublicAccount } from '../account/PublicAccount'; import { MosaicId } from '../mosaic/MosaicId'; import { AliasAction } from '../namespace/AliasAction'; import { NamespaceId } from '../namespace/NamespaceId'; @@ -24,7 +25,6 @@ import { AddressAliasTransaction } from './AddressAliasTransaction'; import { Deadline } from './Deadline'; import { MosaicAliasTransaction } from './MosaicAliasTransaction'; import { Transaction } from './Transaction'; -import { PublicAccount } from '../account/PublicAccount'; export abstract class AliasTransaction extends Transaction { /** diff --git a/src/model/transaction/LockFundsTransaction.ts b/src/model/transaction/LockFundsTransaction.ts index d8c56b795a..c529acb2a3 100644 --- a/src/model/transaction/LockFundsTransaction.ts +++ b/src/model/transaction/LockFundsTransaction.ts @@ -24,12 +24,13 @@ import { KeyDto, SignatureDto, TimestampDto, + TransactionBuilder, UnresolvedMosaicBuilder, UnresolvedMosaicIdDto, - TransactionBuilder, } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; import { Mosaic } from '../mosaic/Mosaic'; import { MosaicId } from '../mosaic/MosaicId'; @@ -43,7 +44,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; /** * Lock funds transaction is used before sending an Aggregate bonded transaction, as a deposit to announce the transaction. diff --git a/src/model/transaction/MosaicAddressRestrictionTransaction.ts b/src/model/transaction/MosaicAddressRestrictionTransaction.ts index a3ac17d80d..9d06596971 100644 --- a/src/model/transaction/MosaicAddressRestrictionTransaction.ts +++ b/src/model/transaction/MosaicAddressRestrictionTransaction.ts @@ -22,15 +22,17 @@ import { MosaicAddressRestrictionTransactionBuilder, SignatureDto, TimestampDto, + TransactionBuilder, UnresolvedAddressDto, UnresolvedMosaicIdDto, - TransactionBuilder, } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; +import { UnresolvedAddress } from '../account/UnresolvedAddress'; +import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; import { NamespaceId } from '../namespace/NamespaceId'; import { NetworkType } from '../network/NetworkType'; import { Statement } from '../receipt/Statement'; @@ -41,8 +43,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { UnresolvedAddress } from '../account/UnresolvedAddress'; -import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; export class MosaicAddressRestrictionTransaction extends Transaction { /** diff --git a/src/model/transaction/MosaicAliasTransaction.ts b/src/model/transaction/MosaicAliasTransaction.ts index 434eafa0ea..5979a8b3b6 100644 --- a/src/model/transaction/MosaicAliasTransaction.ts +++ b/src/model/transaction/MosaicAliasTransaction.ts @@ -27,6 +27,7 @@ import { TransactionBuilder, } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; import { MosaicId } from '../mosaic/MosaicId'; import { AliasAction } from '../namespace/AliasAction'; @@ -39,7 +40,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; export class MosaicAliasTransaction extends Transaction { /** diff --git a/src/model/transaction/MosaicDefinitionTransaction.ts b/src/model/transaction/MosaicDefinitionTransaction.ts index 8b5507538a..e485de780b 100644 --- a/src/model/transaction/MosaicDefinitionTransaction.ts +++ b/src/model/transaction/MosaicDefinitionTransaction.ts @@ -28,6 +28,7 @@ import { TransactionBuilder, } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; import { MosaicFlags } from '../mosaic/MosaicFlags'; import { MosaicId } from '../mosaic/MosaicId'; @@ -40,7 +41,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; /** * Before a mosaic can be created or transferred, a corresponding definition of the mosaic has to be created and published to the network. diff --git a/src/model/transaction/MosaicGlobalRestrictionTransaction.ts b/src/model/transaction/MosaicGlobalRestrictionTransaction.ts index 950be36259..11b9ce36e0 100644 --- a/src/model/transaction/MosaicGlobalRestrictionTransaction.ts +++ b/src/model/transaction/MosaicGlobalRestrictionTransaction.ts @@ -22,13 +22,15 @@ import { MosaicGlobalRestrictionTransactionBuilder, SignatureDto, TimestampDto, - UnresolvedMosaicIdDto, TransactionBuilder, + UnresolvedMosaicIdDto, } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; +import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; import { NetworkType } from '../network/NetworkType'; import { Statement } from '../receipt/Statement'; import { MosaicRestrictionType } from '../restriction/MosaicRestrictionType'; @@ -39,8 +41,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; -import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; export class MosaicGlobalRestrictionTransaction extends Transaction { /** diff --git a/src/model/transaction/MosaicMetadataTransaction.ts b/src/model/transaction/MosaicMetadataTransaction.ts index 2ca0469791..de1ecd846f 100644 --- a/src/model/transaction/MosaicMetadataTransaction.ts +++ b/src/model/transaction/MosaicMetadataTransaction.ts @@ -22,14 +22,17 @@ import { MosaicMetadataTransactionBuilder, SignatureDto, TimestampDto, - UnresolvedMosaicIdDto, - UnresolvedAddressDto, TransactionBuilder, + UnresolvedAddressDto, + UnresolvedMosaicIdDto, } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; +import { UnresolvedAddress } from '../account/UnresolvedAddress'; +import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; import { NamespaceId } from '../namespace/NamespaceId'; import { NetworkType } from '../network/NetworkType'; import { Statement } from '../receipt/Statement'; @@ -40,9 +43,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; -import { UnresolvedAddress } from '../account/UnresolvedAddress'; -import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; /** * Announce an mosaic metadata transaction to associate a key-value state to an account. diff --git a/src/model/transaction/MosaicSupplyChangeTransaction.ts b/src/model/transaction/MosaicSupplyChangeTransaction.ts index fcafc5a2b6..14edd2df03 100644 --- a/src/model/transaction/MosaicSupplyChangeTransaction.ts +++ b/src/model/transaction/MosaicSupplyChangeTransaction.ts @@ -22,14 +22,16 @@ import { MosaicSupplyChangeTransactionBuilder, SignatureDto, TimestampDto, - UnresolvedMosaicIdDto, TransactionBuilder, + UnresolvedMosaicIdDto, } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; import { MosaicSupplyChangeAction } from '../mosaic/MosaicSupplyChangeAction'; +import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; import { NetworkType } from '../network/NetworkType'; import { Statement } from '../receipt/Statement'; import { UInt64 } from '../UInt64'; @@ -39,8 +41,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; -import { UnresolvedMosaicId } from '../mosaic/UnresolvedMosaicId'; /** * In case a mosaic has the flag 'supplyMutable' set to true, the creator of the mosaic can change the supply, diff --git a/src/model/transaction/MultisigAccountModificationTransaction.ts b/src/model/transaction/MultisigAccountModificationTransaction.ts index 690e3837a2..3c05230e21 100644 --- a/src/model/transaction/MultisigAccountModificationTransaction.ts +++ b/src/model/transaction/MultisigAccountModificationTransaction.ts @@ -22,11 +22,15 @@ import { MultisigAccountModificationTransactionBuilder, SignatureDto, TimestampDto, - UnresolvedAddressDto, TransactionBuilder, + UnresolvedAddressDto, } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; +import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; +import { UnresolvedAddress } from '../account/UnresolvedAddress'; +import { NamespaceId } from '../namespace/NamespaceId'; import { NetworkType } from '../network/NetworkType'; import { UInt64 } from '../UInt64'; import { Deadline } from './Deadline'; @@ -35,10 +39,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; -import { UnresolvedAddress } from '../account/UnresolvedAddress'; -import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; -import { NamespaceId } from '../namespace/NamespaceId'; /** * Modify multisig account transactions are part of the NEM's multisig account system. diff --git a/src/model/transaction/NamespaceMetadataTransaction.ts b/src/model/transaction/NamespaceMetadataTransaction.ts index 16aeebf9ba..6e822c0a79 100644 --- a/src/model/transaction/NamespaceMetadataTransaction.ts +++ b/src/model/transaction/NamespaceMetadataTransaction.ts @@ -23,11 +23,14 @@ import { NamespaceMetadataTransactionBuilder, SignatureDto, TimestampDto, - UnresolvedAddressDto, TransactionBuilder, + UnresolvedAddressDto, } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; +import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; +import { UnresolvedAddress } from '../account/UnresolvedAddress'; import { NamespaceId } from '../namespace/NamespaceId'; import { NetworkType } from '../network/NetworkType'; import { UInt64 } from '../UInt64'; @@ -37,9 +40,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; -import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; -import { UnresolvedAddress } from '../account/UnresolvedAddress'; /** * Announce an namespace metadata transaction to associate a key-value state to an account. diff --git a/src/model/transaction/NamespaceRegistrationTransaction.ts b/src/model/transaction/NamespaceRegistrationTransaction.ts index 6c890b9a71..b816aa9820 100644 --- a/src/model/transaction/NamespaceRegistrationTransaction.ts +++ b/src/model/transaction/NamespaceRegistrationTransaction.ts @@ -28,6 +28,7 @@ import { } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; import { NamespaceMosaicIdGenerator } from '../../infrastructure/transaction/NamespaceMosaicIdGenerator'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; import { NamespaceId } from '../namespace/NamespaceId'; import { NamespaceRegistrationType } from '../namespace/NamespaceRegistrationType'; @@ -39,7 +40,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; /** * Accounts can rent a namespace for an amount of blocks and after a this renew the contract. diff --git a/src/model/transaction/NodeKeyLinkTransaction.ts b/src/model/transaction/NodeKeyLinkTransaction.ts index 31c44a8dac..dd8de2eca3 100644 --- a/src/model/transaction/NodeKeyLinkTransaction.ts +++ b/src/model/transaction/NodeKeyLinkTransaction.ts @@ -16,15 +16,16 @@ import { AmountDto, + EmbeddedNodeKeyLinkTransactionBuilder, EmbeddedTransactionBuilder, KeyDto, + NodeKeyLinkTransactionBuilder, SignatureDto, TimestampDto, - EmbeddedNodeKeyLinkTransactionBuilder, - NodeKeyLinkTransactionBuilder, TransactionBuilder, } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../network/NetworkType'; import { UInt64 } from '../UInt64'; @@ -35,7 +36,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; export class NodeKeyLinkTransaction extends Transaction { /** diff --git a/src/model/transaction/PersistentDelegationRequestTransaction.ts b/src/model/transaction/PersistentDelegationRequestTransaction.ts index 79f2118eca..8396fa08ec 100644 --- a/src/model/transaction/PersistentDelegationRequestTransaction.ts +++ b/src/model/transaction/PersistentDelegationRequestTransaction.ts @@ -15,12 +15,12 @@ */ import { Address } from '../account/Address'; +import { PublicAccount } from '../account/PublicAccount'; import { PersistentHarvestingDelegationMessage } from '../message/PersistentHarvestingDelegationMessage'; import { NetworkType } from '../network/NetworkType'; import { UInt64 } from '../UInt64'; import { Deadline } from './Deadline'; import { TransferTransaction } from './TransferTransaction'; -import { PublicAccount } from '../account/PublicAccount'; export class PersistentDelegationRequestTransaction extends TransferTransaction { /** diff --git a/src/model/transaction/SecretLockTransaction.ts b/src/model/transaction/SecretLockTransaction.ts index ff196f3871..e010076dc9 100644 --- a/src/model/transaction/SecretLockTransaction.ts +++ b/src/model/transaction/SecretLockTransaction.ts @@ -23,29 +23,29 @@ import { SecretLockTransactionBuilder, SignatureDto, TimestampDto, + TransactionBuilder, UnresolvedAddressDto, UnresolvedMosaicBuilder, UnresolvedMosaicIdDto, - TransactionBuilder, } from 'catbuffer-typescript'; import { Convert, Convert as convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; +import { UnresolvedAddress } from '../account/UnresolvedAddress'; +import { LockHashAlgorithm, LockHashAlgorithmLengthValidator } from '../lock/LockHashAlgorithm'; import { Mosaic } from '../mosaic/Mosaic'; import { NamespaceId } from '../namespace/NamespaceId'; import { NetworkType } from '../network/NetworkType'; import { Statement } from '../receipt/Statement'; import { UInt64 } from '../UInt64'; import { Deadline } from './Deadline'; -import { LockHashAlgorithmLengthValidator, LockHashAlgorithm } from '../lock/LockHashAlgorithm'; import { InnerTransaction } from './InnerTransaction'; import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { UnresolvedAddress } from '../account/UnresolvedAddress'; export class SecretLockTransaction extends Transaction { /** diff --git a/src/model/transaction/SecretProofTransaction.ts b/src/model/transaction/SecretProofTransaction.ts index 2c56586186..c15f2924c4 100644 --- a/src/model/transaction/SecretProofTransaction.ts +++ b/src/model/transaction/SecretProofTransaction.ts @@ -23,26 +23,26 @@ import { SecretProofTransactionBuilder, SignatureDto, TimestampDto, - UnresolvedAddressDto, TransactionBuilder, + UnresolvedAddressDto, } from 'catbuffer-typescript'; import { Convert, Convert as convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; +import { UnresolvedAddress } from '../account/UnresolvedAddress'; +import { LockHashAlgorithm, LockHashAlgorithmLengthValidator } from '../lock/LockHashAlgorithm'; import { NamespaceId } from '../namespace/NamespaceId'; import { NetworkType } from '../network/NetworkType'; import { Statement } from '../receipt/Statement'; import { UInt64 } from '../UInt64'; import { Deadline } from './Deadline'; -import { LockHashAlgorithmLengthValidator, LockHashAlgorithm } from '../lock/LockHashAlgorithm'; import { InnerTransaction } from './InnerTransaction'; import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { UnresolvedAddress } from '../account/UnresolvedAddress'; export class SecretProofTransaction extends Transaction { /** diff --git a/src/model/transaction/Transaction.ts b/src/model/transaction/Transaction.ts index f607931444..405a24d14c 100644 --- a/src/model/transaction/Transaction.ts +++ b/src/model/transaction/Transaction.ts @@ -20,7 +20,9 @@ import { Convert } from '../../core/format'; import { DtoMapping } from '../../core/utils/DtoMapping'; import { SerializeTransactionToJSON } from '../../infrastructure/transaction/SerializeTransactionToJSON'; import { Account } from '../account/Account'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; +import { NamespaceId } from '../namespace/NamespaceId'; import { NetworkType } from '../network/NetworkType'; import { Statement } from '../receipt/Statement'; import { UInt64 } from '../UInt64'; @@ -30,8 +32,6 @@ import { InnerTransaction } from './InnerTransaction'; import { SignedTransaction } from './SignedTransaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; -import { NamespaceId } from '../namespace/NamespaceId'; -import { Address } from '../account/Address'; /** * An abstract transaction class that serves as the base class of all NEM transactions. diff --git a/src/model/transaction/TransferTransaction.ts b/src/model/transaction/TransferTransaction.ts index 4cf4274a91..7ef4e8298c 100644 --- a/src/model/transaction/TransferTransaction.ts +++ b/src/model/transaction/TransferTransaction.ts @@ -22,11 +22,11 @@ import { KeyDto, SignatureDto, TimestampDto, + TransactionBuilder, TransferTransactionBuilder, UnresolvedAddressDto, UnresolvedMosaicBuilder, UnresolvedMosaicIdDto, - TransactionBuilder, } from 'catbuffer-typescript'; import * as Long from 'long'; import { Convert } from '../../core/format'; @@ -34,8 +34,12 @@ import { DtoMapping } from '../../core/utils/DtoMapping'; import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping'; import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; +import { UnresolvedAddress } from '../account/UnresolvedAddress'; +import { EncryptedMessage } from '../message/EncryptedMessage'; import { Message } from '../message/Message'; import { MessageType } from '../message/MessageType'; +import { PersistentHarvestingDelegationMessage } from '../message/PersistentHarvestingDelegationMessage'; +import { EmptyMessage, PlainMessage } from '../message/PlainMessage'; import { Mosaic } from '../mosaic/Mosaic'; import { NamespaceId } from '../namespace/NamespaceId'; import { NetworkType } from '../network/NetworkType'; @@ -47,10 +51,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { UnresolvedAddress } from '../account/UnresolvedAddress'; -import { EmptyMessage, PlainMessage } from '../message/PlainMessage'; -import { EncryptedMessage } from '../message/EncryptedMessage'; -import { PersistentHarvestingDelegationMessage } from '../message/PersistentHarvestingDelegationMessage'; /** * Transfer transactions contain data about transfers of mosaics and message to another account. diff --git a/src/model/transaction/VotingKeyLinkTransaction.ts b/src/model/transaction/VotingKeyLinkTransaction.ts index a85e876884..0f9fd76697 100644 --- a/src/model/transaction/VotingKeyLinkTransaction.ts +++ b/src/model/transaction/VotingKeyLinkTransaction.ts @@ -17,15 +17,17 @@ import { AmountDto, EmbeddedTransactionBuilder, + EmbeddedVotingKeyLinkTransactionBuilder, KeyDto, SignatureDto, TimestampDto, - EmbeddedVotingKeyLinkTransactionBuilder, - VotingKeyLinkTransactionBuilder, - VotingKeyDto, TransactionBuilder, + VotingKeyDto, + VotingKeyLinkTransactionBuilder, } from 'catbuffer-typescript'; +import { FinalizationEpochDto } from 'catbuffer-typescript/dist/FinalizationEpochDto'; import { Convert } from '../../core/format'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../network/NetworkType'; import { UInt64 } from '../UInt64'; @@ -36,8 +38,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; -import { FinalizationEpochDto } from 'catbuffer-typescript/dist/FinalizationEpochDto'; export class VotingKeyLinkTransaction extends Transaction { /** diff --git a/src/model/transaction/VrfKeyLinkTransaction.ts b/src/model/transaction/VrfKeyLinkTransaction.ts index a6fd6317cb..b523e1a85a 100644 --- a/src/model/transaction/VrfKeyLinkTransaction.ts +++ b/src/model/transaction/VrfKeyLinkTransaction.ts @@ -17,14 +17,15 @@ import { AmountDto, EmbeddedTransactionBuilder, + EmbeddedVrfKeyLinkTransactionBuilder, KeyDto, SignatureDto, TimestampDto, - EmbeddedVrfKeyLinkTransactionBuilder, - VrfKeyLinkTransactionBuilder, TransactionBuilder, + VrfKeyLinkTransactionBuilder, } from 'catbuffer-typescript'; import { Convert } from '../../core/format'; +import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../network/NetworkType'; import { UInt64 } from '../UInt64'; @@ -35,7 +36,6 @@ import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -import { Address } from '../account/Address'; export class VrfKeyLinkTransaction extends Transaction { /** diff --git a/src/service/AccountService.ts b/src/service/AccountService.ts index 42e35b4657..df87f8abd7 100644 --- a/src/service/AccountService.ts +++ b/src/service/AccountService.ts @@ -15,23 +15,22 @@ */ import { Observable, of } from 'rxjs'; -import { map, withLatestFrom, toArray } from 'rxjs/operators'; -import { RepositoryFactory } from '../infrastructure/RepositoryFactory'; +import { map, mergeMap, toArray, withLatestFrom } from 'rxjs/operators'; +import { DtoMapping } from '../core/utils/DtoMapping'; import { AccountRepository } from '../infrastructure/AccountRepository'; import { NamespaceRepository } from '../infrastructure/NamespaceRepository'; +import { NamespacePaginationStreamer } from '../infrastructure/paginationStreamer/NamespacePaginationStreamer'; +import { RepositoryFactory } from '../infrastructure/RepositoryFactory'; +import { AccountInfo } from '../model/account/AccountInfo'; +import { AccountInfoResolvedMosaic } from '../model/account/AccountInfoResolvedMosaic'; import { Address } from '../model/account/Address'; -import { mergeMap } from 'rxjs/operators'; -import { DtoMapping } from '../core/utils/DtoMapping'; -import { IAccountService } from './interfaces/IAccountService'; -import { NamespaceInfoWithName } from '../model/namespace/NamespaceInfoWithName'; -import { ResolvedMosaic } from '../model/mosaic/ResolvedMosaic'; import { Mosaic } from '../model/mosaic/Mosaic'; import { MosaicId } from '../model/mosaic/MosaicId'; +import { ResolvedMosaic } from '../model/mosaic/ResolvedMosaic'; import { NamespaceId } from '../model/namespace/NamespaceId'; -import { AccountInfoResolvedMosaic } from '../model/account/AccountInfoResolvedMosaic'; -import { AccountInfo } from '../model/account/AccountInfo'; +import { NamespaceInfoWithName } from '../model/namespace/NamespaceInfoWithName'; import { NamespaceName } from '../model/namespace/NamespaceName'; -import { NamespacePaginationStreamer } from '../infrastructure/paginationStreamer/NamespacePaginationStreamer'; +import { IAccountService } from './interfaces/IAccountService'; /** * Account Service */ diff --git a/src/service/AggregateTransactionService.ts b/src/service/AggregateTransactionService.ts index 0b11ef1625..d79ee9b27c 100644 --- a/src/service/AggregateTransactionService.ts +++ b/src/service/AggregateTransactionService.ts @@ -18,16 +18,16 @@ import { from as observableFrom, Observable, of as observableOf } from 'rxjs'; import { flatMap, map, mergeMap, toArray } from 'rxjs/operators'; import { TransactionMapping } from '../core/utils/TransactionMapping'; import { MultisigRepository } from '../infrastructure/MultisigRepository'; +import { NetworkRepository } from '../infrastructure/NetworkRepository'; +import { RepositoryFactory } from '../infrastructure/RepositoryFactory'; +import { Address } from '../model/account/Address'; import { MultisigAccountGraphInfo } from '../model/account/MultisigAccountGraphInfo'; +import { MultisigAccountInfo } from '../model/account/MultisigAccountInfo'; import { AggregateTransaction } from '../model/transaction/AggregateTransaction'; import { InnerTransaction } from '../model/transaction/InnerTransaction'; import { MultisigAccountModificationTransaction } from '../model/transaction/MultisigAccountModificationTransaction'; import { SignedTransaction } from '../model/transaction/SignedTransaction'; import { TransactionType } from '../model/transaction/TransactionType'; -import { Address } from '../model/account/Address'; -import { RepositoryFactory } from '../infrastructure/RepositoryFactory'; -import { NetworkRepository } from '../infrastructure/NetworkRepository'; -import { MultisigAccountInfo } from '../model/account/MultisigAccountInfo'; /** * Aggregated Transaction service diff --git a/src/service/BlockService.ts b/src/service/BlockService.ts index b1ca98a8b1..89e07f95a7 100644 --- a/src/service/BlockService.ts +++ b/src/service/BlockService.ts @@ -15,18 +15,18 @@ */ import { sha3_256 } from 'js-sha3'; +import MerkleTree from 'merkletreejs'; import { combineLatest, Observable, of } from 'rxjs'; import { catchError, map, toArray } from 'rxjs/operators'; import { BlockRepository } from '../infrastructure/BlockRepository'; +import { TransactionPaginationStreamer } from '../infrastructure/paginationStreamer/TransactionPaginationStreamer'; import { RepositoryFactory } from '../infrastructure/RepositoryFactory'; +import { TransactionGroup } from '../infrastructure/TransactionGroup'; +import { TransactionRepository } from '../infrastructure/TransactionRepository'; import { MerklePathItem } from '../model/blockchain/MerklePathItem'; +import { MerklePosition } from '../model/blockchain/MerklePosition'; import { UInt64 } from '../model/UInt64'; import { IBlockService } from './interfaces/IBlockService'; -import { MerklePosition } from '../model/blockchain/MerklePosition'; -import { TransactionPaginationStreamer } from '../infrastructure/paginationStreamer/TransactionPaginationStreamer'; -import { TransactionGroup } from '../infrastructure/TransactionGroup'; -import MerkleTree from 'merkletreejs'; -import { TransactionRepository } from '../infrastructure/TransactionRepository'; /** * Block Service diff --git a/src/service/MetadataTransactionService.ts b/src/service/MetadataTransactionService.ts index 3e458b3ad5..dd74e63c1a 100644 --- a/src/service/MetadataTransactionService.ts +++ b/src/service/MetadataTransactionService.ts @@ -18,6 +18,7 @@ import { Observable } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; import { Convert } from '../core/format/Convert'; import { MetadataRepository } from '../infrastructure/MetadataRepository'; +import { Page } from '../infrastructure/Page'; import { Address } from '../model/account/Address'; import { Metadata } from '../model/metadata/Metadata'; import { MetadataType } from '../model/metadata/MetadataType'; @@ -29,7 +30,6 @@ import { Deadline } from '../model/transaction/Deadline'; import { MosaicMetadataTransaction } from '../model/transaction/MosaicMetadataTransaction'; import { NamespaceMetadataTransaction } from '../model/transaction/NamespaceMetadataTransaction'; import { UInt64 } from '../model/UInt64'; -import { Page } from '../infrastructure/Page'; /** * MetadataTransaction service diff --git a/src/service/MosaicRestrictionTransactionService.ts b/src/service/MosaicRestrictionTransactionService.ts index 36bc17d230..b7ca6ec2e6 100644 --- a/src/service/MosaicRestrictionTransactionService.ts +++ b/src/service/MosaicRestrictionTransactionService.ts @@ -17,10 +17,14 @@ import { combineLatest, Observable, of } from 'rxjs'; import { catchError, map, mergeMap } from 'rxjs/operators'; import { NamespaceRepository } from '../infrastructure/NamespaceRepository'; +import { Page } from '../infrastructure/Page'; import { RestrictionMosaicRepository } from '../infrastructure/RestrictionMosaicRepository'; import { Address } from '../model/account/Address'; +import { UnresolvedAddress } from '../model/account/UnresolvedAddress'; import { MosaicId } from '../model/mosaic/MosaicId'; +import { UnresolvedMosaicId } from '../model/mosaic/UnresolvedMosaicId'; import { NetworkType } from '../model/network/NetworkType'; +import { MosaicAddressRestriction } from '../model/restriction/MosaicAddressRestriction'; import { MosaicGlobalRestriction } from '../model/restriction/MosaicGlobalRestriction'; import { MosaicGlobalRestrictionItem } from '../model/restriction/MosaicGlobalRestrictionItem'; import { MosaicRestrictionType } from '../model/restriction/MosaicRestrictionType'; @@ -29,10 +33,6 @@ import { MosaicAddressRestrictionTransaction } from '../model/transaction/Mosaic import { MosaicGlobalRestrictionTransaction } from '../model/transaction/MosaicGlobalRestrictionTransaction'; import { Transaction } from '../model/transaction/Transaction'; import { UInt64 } from '../model/UInt64'; -import { UnresolvedAddress } from '../model/account/UnresolvedAddress'; -import { UnresolvedMosaicId } from '../model/mosaic/UnresolvedMosaicId'; -import { MosaicAddressRestriction } from '../model/restriction/MosaicAddressRestriction'; -import { Page } from '../infrastructure/Page'; /** * MosaicRestrictionTransactionService service diff --git a/src/service/MosaicService.ts b/src/service/MosaicService.ts index 02a543af47..711db32c39 100644 --- a/src/service/MosaicService.ts +++ b/src/service/MosaicService.ts @@ -21,9 +21,9 @@ import { MosaicRepository } from '../infrastructure/MosaicRepository'; import { Address } from '../model/account/Address'; import { Mosaic } from '../model/mosaic/Mosaic'; import { MosaicId } from '../model/mosaic/MosaicId'; +import { MosaicInfo } from '../model/mosaic/MosaicInfo'; import { MosaicAmountView } from './MosaicAmountView'; import { MosaicView } from './MosaicView'; -import { MosaicInfo } from '../model/mosaic/MosaicInfo'; /** * Mosaic service diff --git a/src/service/TransactionService.ts b/src/service/TransactionService.ts index ae278e9939..ea2ed07236 100644 --- a/src/service/TransactionService.ts +++ b/src/service/TransactionService.ts @@ -14,13 +14,16 @@ * limitations under the License. */ -import { merge, Observable, of } from 'rxjs'; +import { combineLatest, merge, Observable, of } from 'rxjs'; import { first, flatMap, map, mergeMap, toArray } from 'rxjs/operators'; import { IListener } from '../infrastructure/IListener'; +import { ReceiptPaginationStreamer } from '../infrastructure/paginationStreamer/ReceiptPaginationStreamer'; import { ReceiptRepository } from '../infrastructure/ReceiptRepository'; +import { TransactionGroup } from '../infrastructure/TransactionGroup'; import { TransactionRepository } from '../infrastructure/TransactionRepository'; import { Address } from '../model/account/Address'; import { NamespaceId } from '../model/namespace/NamespaceId'; +import { Statement } from '../model/receipt/Statement'; import { AccountAddressRestrictionTransaction } from '../model/transaction/AccountAddressRestrictionTransaction'; import { AggregateTransaction } from '../model/transaction/AggregateTransaction'; import { LockFundsTransaction } from '../model/transaction/LockFundsTransaction'; @@ -36,10 +39,6 @@ import { TransactionStatusError } from '../model/transaction/TransactionStatusEr import { TransactionType } from '../model/transaction/TransactionType'; import { TransferTransaction } from '../model/transaction/TransferTransaction'; import { ITransactionService } from './interfaces/ITransactionService'; -import { TransactionGroup } from '../infrastructure/TransactionGroup'; -import { ReceiptPaginationStreamer } from '../infrastructure/paginationStreamer/ReceiptPaginationStreamer'; -import { Statement } from '../model/receipt/Statement'; -import { combineLatest } from 'rxjs'; /** * Transaction Service diff --git a/src/service/index.ts b/src/service/index.ts index 3035138656..c134542369 100644 --- a/src/service/index.ts +++ b/src/service/index.ts @@ -1,10 +1,10 @@ // created from 'create-ts-index' -export * from './interfaces'; export * from './AccountService'; export * from './AggregateTransactionService'; export * from './BlockService'; export * from './CurrencyService'; +export * from './interfaces'; export * from './MetadataTransactionService'; export * from './MosaicAmountView'; export * from './MosaicRestrictionTransactionService'; diff --git a/src/service/interfaces/IAccountService.ts b/src/service/interfaces/IAccountService.ts index 56abb576ed..409f97d3eb 100644 --- a/src/service/interfaces/IAccountService.ts +++ b/src/service/interfaces/IAccountService.ts @@ -15,8 +15,8 @@ */ import { Observable } from 'rxjs'; -import { Address } from '../../model/account/Address'; import { AccountInfoResolvedMosaic } from '../../model/account/AccountInfoResolvedMosaic'; +import { Address } from '../../model/account/Address'; import { NamespaceInfoWithName } from '../../model/namespace/NamespaceInfoWithName'; /** diff --git a/src/service/interfaces/ICurrencyService.ts b/src/service/interfaces/ICurrencyService.ts index 209145a96f..46f969de22 100644 --- a/src/service/interfaces/ICurrencyService.ts +++ b/src/service/interfaces/ICurrencyService.ts @@ -14,9 +14,7 @@ * limitations under the License. */ import { Observable } from 'rxjs'; -import { MosaicId } from '../../model/mosaic'; -import { Currency } from '../../model/mosaic'; -import { NetworkCurrencies } from '../../model/mosaic'; +import { Currency, MosaicId, NetworkCurrencies } from '../../model/mosaic'; /** * A service that allows you loading Network currencies for mosaic creation. diff --git a/test/core/crypto/hkdf.spec.ts b/test/core/crypto/hkdf.spec.ts index 41e55f99ee..4f11f1c7d2 100644 --- a/test/core/crypto/hkdf.spec.ts +++ b/test/core/crypto/hkdf.spec.ts @@ -14,8 +14,8 @@ * limitations under the License. */ import { expect } from 'chai'; -import { Convert } from '../../../src/core/format'; import * as hkdf from 'futoin-hkdf'; +import { Convert } from '../../../src/core/format'; describe('hkdf', () => { describe('Example tests', () => { diff --git a/test/core/utils/DtoMapping.spec.ts b/test/core/utils/DtoMapping.spec.ts index 5a15b912d4..f737fb9da5 100644 --- a/test/core/utils/DtoMapping.spec.ts +++ b/test/core/utils/DtoMapping.spec.ts @@ -14,16 +14,16 @@ * limitations under the License. */ import { expect } from 'chai'; -import { MosaicId } from '../../../src/model/mosaic/MosaicId'; -import { NetworkType } from '../../../src/model/network/NetworkType'; -import { PublicAccount } from '../../../src/model/account/PublicAccount'; import { - AccountRestrictionsInfoDTO, - AccountRestrictionsDTO, AccountRestrictionDTO, AccountRestrictionFlagsEnum, + AccountRestrictionsDTO, + AccountRestrictionsInfoDTO, } from 'symbol-openapi-typescript-fetch-client'; import { DtoMapping } from '../../../src/core/utils/DtoMapping'; +import { PublicAccount } from '../../../src/model/account/PublicAccount'; +import { MosaicId } from '../../../src/model/mosaic/MosaicId'; +import { NetworkType } from '../../../src/model/network/NetworkType'; describe('DtoMapping', () => { const publicAccount = PublicAccount.createFromPublicKey( diff --git a/test/core/utils/EnumMapping.spec.ts b/test/core/utils/EnumMapping.spec.ts index 2b7e2139eb..6eb4671f08 100644 --- a/test/core/utils/EnumMapping.spec.ts +++ b/test/core/utils/EnumMapping.spec.ts @@ -14,12 +14,12 @@ * limitations under the License. */ import { expect } from 'chai'; -import { Order, PositionEnum, BlockOrderByEnum, AccountOrderByEnum } from 'symbol-openapi-typescript-fetch-client'; -import { Order as OrderModel } from '../../../src/infrastructure/searchCriteria/Order'; +import { AccountOrderByEnum, BlockOrderByEnum, Order, PositionEnum } from 'symbol-openapi-typescript-fetch-client'; import { DtoMapping } from '../../../src/core/utils/DtoMapping'; +import { AccountOrderBy } from '../../../src/infrastructure/searchCriteria/AccountOrderBy'; import { BlockOrderBy } from '../../../src/infrastructure/searchCriteria/BlockOrderBy'; +import { Order as OrderModel } from '../../../src/infrastructure/searchCriteria/Order'; import { MerklePosition } from '../../../src/model/blockchain/MerklePosition'; -import { AccountOrderBy } from '../../../src/infrastructure/searchCriteria/AccountOrderBy'; describe('Order', () => { it('should be able to map Order', () => { diff --git a/test/core/utils/Hashes.spec.ts b/test/core/utils/Hashes.spec.ts index c168abe869..957e34118a 100644 --- a/test/core/utils/Hashes.spec.ts +++ b/test/core/utils/Hashes.spec.ts @@ -14,13 +14,13 @@ * limitations under the License. */ import { expect } from 'chai'; -import { Crypto } from '../../../src/core/crypto'; +import { sha256 } from 'js-sha256'; import { sha3_256 } from 'js-sha3'; +import * as ripemd160 from 'ripemd160'; +import { Crypto } from '../../../src/core/crypto'; +import { Convert } from '../../../src/core/format/Convert'; import { LockHashUtils } from '../../../src/core/utils/LockHashUtils'; import { LockHashAlgorithm } from '../../../src/model/lock/LockHashAlgorithm'; -import { Convert } from '../../../src/core/format/Convert'; -import * as ripemd160 from 'ripemd160'; -import { sha256 } from 'js-sha256'; describe('Hashes', () => { it('Op_Sha3_256', () => { diff --git a/test/core/utils/TransactionMapping.spec.ts b/test/core/utils/TransactionMapping.spec.ts index 768f2af174..2cfcfca510 100644 --- a/test/core/utils/TransactionMapping.spec.ts +++ b/test/core/utils/TransactionMapping.spec.ts @@ -17,23 +17,21 @@ import { deepEqual } from 'assert'; import { expect } from 'chai'; import { sha3_256 } from 'js-sha3'; +import { Crypto } from '../../../src/core/crypto'; import { Convert } from '../../../src/core/format'; import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; -import { Account } from '../../../src/model/account'; -import { Address } from '../../../src/model/account'; +import { Account, Address } from '../../../src/model/account'; +import { LockHashAlgorithm } from '../../../src/model/lock/LockHashAlgorithm'; import { EncryptedMessage } from '../../../src/model/message/EncryptedMessage'; import { MessageType } from '../../../src/model/message/MessageType'; import { PlainMessage } from '../../../src/model/message/PlainMessage'; -import { Mosaic } from '../../../src/model/mosaic'; -import { MosaicFlags } from '../../../src/model/mosaic'; -import { MosaicId } from '../../../src/model/mosaic'; -import { MosaicNonce } from '../../../src/model/mosaic'; -import { MosaicSupplyChangeAction } from '../../../src/model/mosaic'; -import { AliasAction } from '../../../src/model/namespace'; -import { NamespaceId } from '../../../src/model/namespace'; -import { NamespaceRegistrationType } from '../../../src/model/namespace'; +import { Mosaic, MosaicFlags, MosaicId, MosaicNonce, MosaicSupplyChangeAction } from '../../../src/model/mosaic'; +import { AliasAction, NamespaceId, NamespaceRegistrationType } from '../../../src/model/namespace'; import { NetworkType } from '../../../src/model/network/NetworkType'; +import { AddressRestrictionFlag } from '../../../src/model/restriction/AddressRestrictionFlag'; +import { MosaicRestrictionFlag } from '../../../src/model/restriction/MosaicRestrictionFlag'; import { MosaicRestrictionType } from '../../../src/model/restriction/MosaicRestrictionType'; +import { OperationRestrictionFlag } from '../../../src/model/restriction/OperationRestrictionFlag'; import { AccountAddressRestrictionTransaction } from '../../../src/model/transaction/AccountAddressRestrictionTransaction'; import { AccountKeyLinkTransaction } from '../../../src/model/transaction/AccountKeyLinkTransaction'; import { AccountMetadataTransaction } from '../../../src/model/transaction/AccountMetadataTransaction'; @@ -43,7 +41,6 @@ import { AccountRestrictionTransaction } from '../../../src/model/transaction/Ac import { AddressAliasTransaction } from '../../../src/model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../../src/model/transaction/AggregateTransaction'; import { Deadline } from '../../../src/model/transaction/Deadline'; -import { LockHashAlgorithm } from '../../../src/model/lock/LockHashAlgorithm'; import { LinkAction } from '../../../src/model/transaction/LinkAction'; import { LockFundsTransaction } from '../../../src/model/transaction/LockFundsTransaction'; import { MosaicAddressRestrictionTransaction } from '../../../src/model/transaction/MosaicAddressRestrictionTransaction'; @@ -55,19 +52,15 @@ import { MosaicSupplyChangeTransaction } from '../../../src/model/transaction/Mo import { MultisigAccountModificationTransaction } from '../../../src/model/transaction/MultisigAccountModificationTransaction'; import { NamespaceMetadataTransaction } from '../../../src/model/transaction/NamespaceMetadataTransaction'; import { NamespaceRegistrationTransaction } from '../../../src/model/transaction/NamespaceRegistrationTransaction'; +import { NodeKeyLinkTransaction } from '../../../src/model/transaction/NodeKeyLinkTransaction'; import { SecretLockTransaction } from '../../../src/model/transaction/SecretLockTransaction'; import { SecretProofTransaction } from '../../../src/model/transaction/SecretProofTransaction'; import { TransactionType } from '../../../src/model/transaction/TransactionType'; import { TransferTransaction } from '../../../src/model/transaction/TransferTransaction'; +import { VotingKeyLinkTransaction } from '../../../src/model/transaction/VotingKeyLinkTransaction'; +import { VrfKeyLinkTransaction } from '../../../src/model/transaction/VrfKeyLinkTransaction'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import { VrfKeyLinkTransaction } from '../../../src/model/transaction/VrfKeyLinkTransaction'; -import { VotingKeyLinkTransaction } from '../../../src/model/transaction/VotingKeyLinkTransaction'; -import { Crypto } from '../../../src/core/crypto'; -import { NodeKeyLinkTransaction } from '../../../src/model/transaction/NodeKeyLinkTransaction'; -import { AddressRestrictionFlag } from '../../../src/model/restriction/AddressRestrictionFlag'; -import { OperationRestrictionFlag } from '../../../src/model/restriction/OperationRestrictionFlag'; -import { MosaicRestrictionFlag } from '../../../src/model/restriction/MosaicRestrictionFlag'; import { NetworkCurrencyLocal } from '../../model/mosaic/Currency.spec'; describe('TransactionMapping - createFromPayload', () => { diff --git a/test/core/utils/TransactionMappingWithSignatures.spec.ts b/test/core/utils/TransactionMappingWithSignatures.spec.ts index 33a771d20b..ab9380a87d 100644 --- a/test/core/utils/TransactionMappingWithSignatures.spec.ts +++ b/test/core/utils/TransactionMappingWithSignatures.spec.ts @@ -17,20 +17,19 @@ import { deepEqual } from 'assert'; import { expect } from 'chai'; import { sha3_256 } from 'js-sha3'; +import { Crypto } from '../../../src/core/crypto'; import { Convert } from '../../../src/core/format'; import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; -import { Account } from '../../../src/model/account'; -import { Address } from '../../../src/model/account'; +import { Account, Address } from '../../../src/model/account'; +import { LockHashAlgorithm } from '../../../src/model/lock/LockHashAlgorithm'; import { PlainMessage } from '../../../src/model/message/PlainMessage'; -import { MosaicFlags } from '../../../src/model/mosaic'; -import { MosaicId } from '../../../src/model/mosaic'; -import { MosaicNonce } from '../../../src/model/mosaic'; -import { MosaicSupplyChangeAction } from '../../../src/model/mosaic'; -import { AliasAction } from '../../../src/model/namespace'; -import { NamespaceId } from '../../../src/model/namespace'; -import { NamespaceRegistrationType } from '../../../src/model/namespace'; +import { MosaicFlags, MosaicId, MosaicNonce, MosaicSupplyChangeAction } from '../../../src/model/mosaic'; +import { AliasAction, NamespaceId, NamespaceRegistrationType } from '../../../src/model/namespace'; import { NetworkType } from '../../../src/model/network/NetworkType'; +import { AddressRestrictionFlag } from '../../../src/model/restriction/AddressRestrictionFlag'; +import { MosaicRestrictionFlag } from '../../../src/model/restriction/MosaicRestrictionFlag'; import { MosaicRestrictionType } from '../../../src/model/restriction/MosaicRestrictionType'; +import { OperationRestrictionFlag } from '../../../src/model/restriction/OperationRestrictionFlag'; import { AccountAddressRestrictionTransaction } from '../../../src/model/transaction/AccountAddressRestrictionTransaction'; import { AccountKeyLinkTransaction } from '../../../src/model/transaction/AccountKeyLinkTransaction'; import { AccountMetadataTransaction } from '../../../src/model/transaction/AccountMetadataTransaction'; @@ -40,7 +39,6 @@ import { AccountRestrictionTransaction } from '../../../src/model/transaction/Ac import { AddressAliasTransaction } from '../../../src/model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../../src/model/transaction/AggregateTransaction'; import { Deadline } from '../../../src/model/transaction/Deadline'; -import { LockHashAlgorithm } from '../../../src/model/lock/LockHashAlgorithm'; import { LinkAction } from '../../../src/model/transaction/LinkAction'; import { LockFundsTransaction } from '../../../src/model/transaction/LockFundsTransaction'; import { MosaicAddressRestrictionTransaction } from '../../../src/model/transaction/MosaicAddressRestrictionTransaction'; @@ -52,19 +50,15 @@ import { MosaicSupplyChangeTransaction } from '../../../src/model/transaction/Mo import { MultisigAccountModificationTransaction } from '../../../src/model/transaction/MultisigAccountModificationTransaction'; import { NamespaceMetadataTransaction } from '../../../src/model/transaction/NamespaceMetadataTransaction'; import { NamespaceRegistrationTransaction } from '../../../src/model/transaction/NamespaceRegistrationTransaction'; +import { NodeKeyLinkTransaction } from '../../../src/model/transaction/NodeKeyLinkTransaction'; import { SecretLockTransaction } from '../../../src/model/transaction/SecretLockTransaction'; import { SecretProofTransaction } from '../../../src/model/transaction/SecretProofTransaction'; import { TransactionType } from '../../../src/model/transaction/TransactionType'; import { TransferTransaction } from '../../../src/model/transaction/TransferTransaction'; +import { VotingKeyLinkTransaction } from '../../../src/model/transaction/VotingKeyLinkTransaction'; +import { VrfKeyLinkTransaction } from '../../../src/model/transaction/VrfKeyLinkTransaction'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import { VrfKeyLinkTransaction } from '../../../src/model/transaction/VrfKeyLinkTransaction'; -import { VotingKeyLinkTransaction } from '../../../src/model/transaction/VotingKeyLinkTransaction'; -import { Crypto } from '../../../src/core/crypto'; -import { NodeKeyLinkTransaction } from '../../../src/model/transaction/NodeKeyLinkTransaction'; -import { AddressRestrictionFlag } from '../../../src/model/restriction/AddressRestrictionFlag'; -import { MosaicRestrictionFlag } from '../../../src/model/restriction/MosaicRestrictionFlag'; -import { OperationRestrictionFlag } from '../../../src/model/restriction/OperationRestrictionFlag'; import { NetworkCurrencyLocal } from '../../model/mosaic/Currency.spec'; describe('TransactionMapping - createFromPayload with optional sigature and signer', () => { diff --git a/test/infrastructure/AccountHttp.spec.ts b/test/infrastructure/AccountHttp.spec.ts index efea6107d2..01e4d2ec87 100644 --- a/test/infrastructure/AccountHttp.spec.ts +++ b/test/infrastructure/AccountHttp.spec.ts @@ -19,14 +19,14 @@ import { AccountDTO, AccountIds, AccountInfoDTO, + AccountLinkPublicKeyDTO, + AccountLinkVotingKeyDTO, + AccountPage, AccountRoutesApi, AccountTypeEnum, ActivityBucketDTO, Mosaic, - AccountLinkPublicKeyDTO, - AccountLinkVotingKeyDTO, Pagination, - AccountPage, } from 'symbol-openapi-typescript-fetch-client'; import { deepEqual, instance, mock, reset, when } from 'ts-mockito'; import { DtoMapping } from '../../src/core/utils/DtoMapping'; diff --git a/test/infrastructure/ChainHttp.spec.ts b/test/infrastructure/ChainHttp.spec.ts index 75d1c426e3..dd53b77986 100644 --- a/test/infrastructure/ChainHttp.spec.ts +++ b/test/infrastructure/ChainHttp.spec.ts @@ -15,7 +15,7 @@ */ import { expect } from 'chai'; import * as http from 'http'; -import { ChainInfoDTO, FinalizedBlockDTO, ChainRoutesApi } from 'symbol-openapi-typescript-fetch-client'; +import { ChainInfoDTO, ChainRoutesApi, FinalizedBlockDTO } from 'symbol-openapi-typescript-fetch-client'; import { instance, mock, reset, when } from 'ts-mockito'; import { DtoMapping } from '../../src/core/utils/DtoMapping'; import { ChainHttp } from '../../src/infrastructure/ChainHttp'; diff --git a/test/infrastructure/FinalizationHttp.spec.ts b/test/infrastructure/FinalizationHttp.spec.ts index 9a302b4584..99b9622bee 100644 --- a/test/infrastructure/FinalizationHttp.spec.ts +++ b/test/infrastructure/FinalizationHttp.spec.ts @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { deepEqual } from 'assert'; import { expect } from 'chai'; import * as http from 'http'; import { + BmTreeSignature, + FinalizationProofDTO, FinalizationRoutesApi, MessageGroup, - StageEnum, ParentPublicKeySignaturePair, - BmTreeSignature, + StageEnum, } from 'symbol-openapi-typescript-fetch-client'; import { instance, mock, reset, when } from 'ts-mockito'; import { DtoMapping } from '../../src/core/utils/DtoMapping'; -import { FinalizationProofDTO } from 'symbol-openapi-typescript-fetch-client'; -import { FinalizationProof } from '../../src/model/finalization/FinalizationProof'; -import { deepEqual } from 'assert'; import { FinalizationHttp } from '../../src/infrastructure/FinalizationHttp'; +import { FinalizationProof } from '../../src/model/finalization/FinalizationProof'; import { UInt64 } from '../../src/model/UInt64'; describe('FinalizationHttp', () => { diff --git a/test/infrastructure/HashLockHttp.spec.ts b/test/infrastructure/HashLockHttp.spec.ts index 08a6138453..d29f8bdb24 100644 --- a/test/infrastructure/HashLockHttp.spec.ts +++ b/test/infrastructure/HashLockHttp.spec.ts @@ -15,7 +15,7 @@ */ import { expect } from 'chai'; import * as http from 'http'; -import { Pagination, HashLockInfoDTO, HashLockEntryDTO, HashLockRoutesApi, HashLockPage } from 'symbol-openapi-typescript-fetch-client'; +import { HashLockEntryDTO, HashLockInfoDTO, HashLockPage, HashLockRoutesApi, Pagination } from 'symbol-openapi-typescript-fetch-client'; import { instance, mock, reset, when } from 'ts-mockito'; import { DtoMapping } from '../../src/core/utils/DtoMapping'; import { HashLockHttp } from '../../src/infrastructure/HashLockHttp'; diff --git a/test/infrastructure/Listener.spec.ts b/test/infrastructure/Listener.spec.ts index 80a15d89c4..77db4888a2 100644 --- a/test/infrastructure/Listener.spec.ts +++ b/test/infrastructure/Listener.spec.ts @@ -23,6 +23,7 @@ import { NamespaceRepository } from '../../src/infrastructure/NamespaceRepositor import { Account } from '../../src/model/account/Account'; import { AccountNames } from '../../src/model/account/AccountNames'; import { Address } from '../../src/model/account/Address'; +import { FinalizedBlock } from '../../src/model/blockchain/FinalizedBlock'; import { NewBlock } from '../../src/model/blockchain/NewBlock'; import { PlainMessage } from '../../src/model/message/PlainMessage'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; @@ -33,7 +34,6 @@ import { Transaction } from '../../src/model/transaction/Transaction'; import { TransactionStatusError } from '../../src/model/transaction/TransactionStatusError'; import { TransferTransaction } from '../../src/model/transaction/TransferTransaction'; import { UInt64 } from '../../src/model/UInt64'; -import { FinalizedBlock } from '../../src/model/blockchain/FinalizedBlock'; describe('Listener', () => { const account = Account.createFromPrivateKey( diff --git a/test/infrastructure/MetadataHttp.spec.ts b/test/infrastructure/MetadataHttp.spec.ts index 57705695b9..e1b6ec8f42 100644 --- a/test/infrastructure/MetadataHttp.spec.ts +++ b/test/infrastructure/MetadataHttp.spec.ts @@ -16,11 +16,11 @@ import { expect } from 'chai'; import { MetadataEntryDTO, + MetadataInfoDTO, + MetadataPage, MetadataRoutesApi, MetadataTypeEnum, Order, - MetadataInfoDTO, - MetadataPage, Pagination, } from 'symbol-openapi-typescript-fetch-client'; import { instance, mock, reset, when } from 'ts-mockito'; diff --git a/test/infrastructure/NamespaceHttp.spec.ts b/test/infrastructure/NamespaceHttp.spec.ts index 23bacba22f..4c4254d866 100644 --- a/test/infrastructure/NamespaceHttp.spec.ts +++ b/test/infrastructure/NamespaceHttp.spec.ts @@ -26,9 +26,9 @@ import { NamespaceInfoDTO, NamespaceMetaDTO, NamespaceNameDTO, + NamespacePage, NamespaceRoutesApi, Pagination, - NamespacePage, } from 'symbol-openapi-typescript-fetch-client'; import { deepEqual, instance, mock, reset, when } from 'ts-mockito'; import { DtoMapping } from '../../src/core/utils/DtoMapping'; diff --git a/test/infrastructure/Page.spec.ts b/test/infrastructure/Page.spec.ts index ee5e93a337..33e2efb5ec 100644 --- a/test/infrastructure/Page.spec.ts +++ b/test/infrastructure/Page.spec.ts @@ -18,9 +18,7 @@ import { expect } from 'chai'; import { Page } from '../../src/infrastructure'; import { PlainMessage } from '../../src/model/message'; import { NetworkType } from '../../src/model/network'; -import { Deadline } from '../../src/model/transaction'; -import { Transaction } from '../../src/model/transaction'; -import { TransferTransaction } from '../../src/model/transaction'; +import { Deadline, Transaction, TransferTransaction } from '../../src/model/transaction'; import { TestingAccount } from '../conf/conf.spec'; describe('Page', () => { diff --git a/test/infrastructure/ReceiptHttp.spec.ts b/test/infrastructure/ReceiptHttp.spec.ts index d394068b60..29ba50d52c 100644 --- a/test/infrastructure/ReceiptHttp.spec.ts +++ b/test/infrastructure/ReceiptHttp.spec.ts @@ -16,27 +16,27 @@ import { expect } from 'chai'; import * as http from 'http'; import { + BalanceChangeReceiptDTO, + Pagination, ReceiptRoutesApi, - ResolutionStatementDTO, + ReceiptTypeEnum, ResolutionEntryDTO, - SourceDTO, + ResolutionStatementDTO, + ResolutionStatementInfoDTO, ResolutionStatementPage, + SourceDTO, TransactionStatementDTO, - BalanceChangeReceiptDTO, - ReceiptTypeEnum, + TransactionStatementInfoDTO, TransactionStatementPage, } from 'symbol-openapi-typescript-fetch-client'; import { instance, mock, reset, when } from 'ts-mockito'; +import { Convert } from '../../src/core/format/Convert'; +import { RawAddress } from '../../src/core/format/RawAddress'; import { DtoMapping } from '../../src/core/utils/DtoMapping'; import { ReceiptHttp } from '../../src/infrastructure/ReceiptHttp'; +import { MosaicId, NamespaceId, ResolutionType, UInt64 } from '../../src/model'; import { PublicAccount } from '../../src/model/account/PublicAccount'; -import { UInt64, NamespaceId, MosaicId, ResolutionType } from '../../src/model'; import { NetworkType } from '../../src/model/network/NetworkType'; -import { ResolutionStatementInfoDTO } from 'symbol-openapi-typescript-fetch-client'; -import { Pagination } from 'symbol-openapi-typescript-fetch-client'; -import { RawAddress } from '../../src/core/format/RawAddress'; -import { Convert } from '../../src/core/format/Convert'; -import { TransactionStatementInfoDTO } from 'symbol-openapi-typescript-fetch-client'; import { BalanceChangeReceipt } from '../../src/model/receipt/BalanceChangeReceipt'; describe('ReceiptHttp', () => { diff --git a/test/infrastructure/RepositoryFactory.spec.ts b/test/infrastructure/RepositoryFactory.spec.ts index f41a2ae290..f4a32f6c03 100644 --- a/test/infrastructure/RepositoryFactory.spec.ts +++ b/test/infrastructure/RepositoryFactory.spec.ts @@ -14,12 +14,15 @@ * limitations under the License. */ import { expect } from 'chai'; -import { of, of as observableOf } from 'rxjs'; +import { of as observableOf, of } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; +import { NetworkConfigurationDTO } from 'symbol-openapi-typescript-fetch-client'; import { instance, mock, when } from 'ts-mockito'; import { AccountHttp } from '../../src/infrastructure/AccountHttp'; import { BlockHttp } from '../../src/infrastructure/BlockHttp'; import { ChainHttp } from '../../src/infrastructure/ChainHttp'; +import { FinalizationHttp } from '../../src/infrastructure/FinalizationHttp'; +import { HashLockHttp } from '../../src/infrastructure/HashLockHttp'; import { Listener } from '../../src/infrastructure/Listener'; import { MetadataHttp } from '../../src/infrastructure/MetadataHttp'; import { MosaicHttp } from '../../src/infrastructure/MosaicHttp'; @@ -34,16 +37,13 @@ import { ReceiptHttp } from '../../src/infrastructure/ReceiptHttp'; import { RepositoryFactoryHttp } from '../../src/infrastructure/RepositoryFactoryHttp'; import { RestrictionAccountHttp } from '../../src/infrastructure/RestrictionAccountHttp'; import { RestrictionMosaicHttp } from '../../src/infrastructure/RestrictionMosaicHttp'; +import { SecretLockHttp } from '../../src/infrastructure/SecretLockHttp'; import { TransactionGroup } from '../../src/infrastructure/TransactionGroup'; import { TransactionHttp } from '../../src/infrastructure/TransactionHttp'; import { TransactionStatusHttp } from '../../src/infrastructure/TransactionStatusHttp'; import { NetworkCurrencies } from '../../src/model/mosaic/NetworkCurrencies'; import { NetworkType } from '../../src/model/network/NetworkType'; import { NodeInfo } from '../../src/model/node/NodeInfo'; -import { HashLockHttp } from '../../src/infrastructure/HashLockHttp'; -import { SecretLockHttp } from '../../src/infrastructure/SecretLockHttp'; -import { FinalizationHttp } from '../../src/infrastructure/FinalizationHttp'; -import { NetworkConfigurationDTO } from 'symbol-openapi-typescript-fetch-client'; describe('RepositoryFactory', () => { it('Should create repositories', () => { diff --git a/test/infrastructure/RestrictionMosaicHttp.spec.ts b/test/infrastructure/RestrictionMosaicHttp.spec.ts index b06ee578c6..4173a57685 100644 --- a/test/infrastructure/RestrictionMosaicHttp.spec.ts +++ b/test/infrastructure/RestrictionMosaicHttp.spec.ts @@ -24,10 +24,10 @@ import { MosaicGlobalRestrictionEntryRestrictionDTO, MosaicGlobalRestrictionEntryWrapperDTO, MosaicRestrictionEntryTypeEnum, - MosaicRestrictionTypeEnum, - RestrictionMosaicRoutesApi, MosaicRestrictionsPage, + MosaicRestrictionTypeEnum, Pagination, + RestrictionMosaicRoutesApi, } from 'symbol-openapi-typescript-fetch-client'; import { instance, mock, reset, when } from 'ts-mockito'; import { DtoMapping } from '../../src/core/utils/DtoMapping'; diff --git a/test/infrastructure/SecretLockHttp.spec.ts b/test/infrastructure/SecretLockHttp.spec.ts index bd419c0c7e..aa424facea 100644 --- a/test/infrastructure/SecretLockHttp.spec.ts +++ b/test/infrastructure/SecretLockHttp.spec.ts @@ -16,12 +16,12 @@ import { expect } from 'chai'; import * as http from 'http'; import { + LockHashAlgorithmEnum, Pagination, - SecretLockInfoDTO, SecretLockEntryDTO, - SecretLockRoutesApi, + SecretLockInfoDTO, SecretLockPage, - LockHashAlgorithmEnum, + SecretLockRoutesApi, } from 'symbol-openapi-typescript-fetch-client'; import { instance, mock, reset, when } from 'ts-mockito'; import { DtoMapping } from '../../src/core/utils/DtoMapping'; diff --git a/test/infrastructure/SerializeTransactionToJSON.spec.ts b/test/infrastructure/SerializeTransactionToJSON.spec.ts index 1ccec12a1a..3f74fb4336 100644 --- a/test/infrastructure/SerializeTransactionToJSON.spec.ts +++ b/test/infrastructure/SerializeTransactionToJSON.spec.ts @@ -20,6 +20,7 @@ import { Crypto } from '../../src/core/crypto'; import { Convert as convert, Convert } from '../../src/core/format'; import { Account } from '../../src/model/account/Account'; import { Address } from '../../src/model/account/Address'; +import { LockHashAlgorithm } from '../../src/model/lock/LockHashAlgorithm'; import { PlainMessage } from '../../src/model/message/PlainMessage'; import { MosaicFlags } from '../../src/model/mosaic/MosaicFlags'; import { MosaicId } from '../../src/model/mosaic/MosaicId'; @@ -38,7 +39,6 @@ import { AggregateTransaction } from '../../src/model/transaction/AggregateTrans import { Deadline } from '../../src/model/transaction/Deadline'; import { LinkAction } from '../../src/model/transaction/LinkAction'; import { LockFundsTransaction } from '../../src/model/transaction/LockFundsTransaction'; -import { LockHashAlgorithm } from '../../src/model/lock/LockHashAlgorithm'; import { MosaicAliasTransaction } from '../../src/model/transaction/MosaicAliasTransaction'; import { MosaicDefinitionTransaction } from '../../src/model/transaction/MosaicDefinitionTransaction'; import { MosaicSupplyChangeTransaction } from '../../src/model/transaction/MosaicSupplyChangeTransaction'; diff --git a/test/infrastructure/TransactionHttp.spec.ts b/test/infrastructure/TransactionHttp.spec.ts index 6b211afb78..acdbd2ca23 100644 --- a/test/infrastructure/TransactionHttp.spec.ts +++ b/test/infrastructure/TransactionHttp.spec.ts @@ -32,7 +32,6 @@ import { } from 'symbol-openapi-typescript-fetch-client'; import { deepEqual, instance, mock, when } from 'ts-mockito'; import { TransactionGroup } from '../../src/infrastructure/TransactionGroup'; - import { TransactionHttp } from '../../src/infrastructure/TransactionHttp'; import { Address } from '../../src/model/account/Address'; import { PlainMessage } from '../../src/model/message/PlainMessage'; diff --git a/test/infrastructure/TransactionStatusHttp.spec.ts b/test/infrastructure/TransactionStatusHttp.spec.ts index e64494ad8c..74168e84c9 100644 --- a/test/infrastructure/TransactionStatusHttp.spec.ts +++ b/test/infrastructure/TransactionStatusHttp.spec.ts @@ -23,7 +23,6 @@ import { } from 'symbol-openapi-typescript-fetch-client'; import { deepEqual, instance, mock, when } from 'ts-mockito'; import { TransactionStatusHttp } from '../../src/infrastructure/TransactionStatusHttp'; - import { NIS2_URL } from '../conf/conf.spec'; describe('TransactionStatusHttp', () => { diff --git a/test/infrastructure/streamer/AccountPaginationStreamer.spec.ts b/test/infrastructure/streamer/AccountPaginationStreamer.spec.ts index 66e5603aaa..717d634ad9 100644 --- a/test/infrastructure/streamer/AccountPaginationStreamer.spec.ts +++ b/test/infrastructure/streamer/AccountPaginationStreamer.spec.ts @@ -15,9 +15,9 @@ */ import { instance, mock } from 'ts-mockito'; +import { AccountRepository } from '../../../src/infrastructure/AccountRepository'; import { AccountPaginationStreamer } from '../../../src/infrastructure/paginationStreamer/AccountPaginationStreamer'; import { PaginationStreamerTestHelper } from './PaginationStreamerTestHelper'; -import { AccountRepository } from '../../../src/infrastructure/AccountRepository'; describe('AccountPaginationStreamer', () => { it('basicMultiPageTest', () => { diff --git a/test/infrastructure/streamer/HashLockPaginationStreamer.spec.ts b/test/infrastructure/streamer/HashLockPaginationStreamer.spec.ts index bb2e339b4c..2dbbc99755 100644 --- a/test/infrastructure/streamer/HashLockPaginationStreamer.spec.ts +++ b/test/infrastructure/streamer/HashLockPaginationStreamer.spec.ts @@ -15,10 +15,10 @@ */ import { instance, mock } from 'ts-mockito'; -import { HashLockPaginationStreamer } from '../../../src/infrastructure/paginationStreamer/HashLockPaginationStreamer'; -import { PaginationStreamerTestHelper } from './PaginationStreamerTestHelper'; import { HashLockRepository } from '../../../src/infrastructure/HashLockRepository'; +import { HashLockPaginationStreamer } from '../../../src/infrastructure/paginationStreamer/HashLockPaginationStreamer'; import { Address } from '../../../src/model/account/Address'; +import { PaginationStreamerTestHelper } from './PaginationStreamerTestHelper'; describe('HashLockPaginationStreamer', () => { const address = Address.createFromRawAddress('QATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA367I6OQ'); diff --git a/test/infrastructure/streamer/MetadataPaginationStreamer.spec.ts b/test/infrastructure/streamer/MetadataPaginationStreamer.spec.ts index b9a135572b..07c3f84e34 100644 --- a/test/infrastructure/streamer/MetadataPaginationStreamer.spec.ts +++ b/test/infrastructure/streamer/MetadataPaginationStreamer.spec.ts @@ -15,9 +15,9 @@ */ import { instance, mock } from 'ts-mockito'; +import { MetadataRepository } from '../../../src/infrastructure/MetadataRepository'; import { MetadataPaginationStreamer } from '../../../src/infrastructure/paginationStreamer/MetadataPaginationStreamer'; import { PaginationStreamerTestHelper } from './PaginationStreamerTestHelper'; -import { MetadataRepository } from '../../../src/infrastructure/MetadataRepository'; describe('MetadataPaginationStreamer', () => { it('basicMultiPageTest', () => { diff --git a/test/infrastructure/streamer/MosaicRestrictionsPaginationStreamer.spec.ts b/test/infrastructure/streamer/MosaicRestrictionsPaginationStreamer.spec.ts index 0f2049e050..99f7d00a50 100644 --- a/test/infrastructure/streamer/MosaicRestrictionsPaginationStreamer.spec.ts +++ b/test/infrastructure/streamer/MosaicRestrictionsPaginationStreamer.spec.ts @@ -16,8 +16,8 @@ import { instance, mock } from 'ts-mockito'; import { RestrictionMosaicPaginationStreamer } from '../../../src/infrastructure/paginationStreamer/RestrictionMosaicPaginationStreamer'; -import { PaginationStreamerTestHelper } from './PaginationStreamerTestHelper'; import { RestrictionMosaicRepository } from '../../../src/infrastructure/RestrictionMosaicRepository'; +import { PaginationStreamerTestHelper } from './PaginationStreamerTestHelper'; describe('MosaicRestrictionPaginationStreamer - transaction', () => { it('basicMultiPageTest', () => { diff --git a/test/infrastructure/streamer/NamespacePaginationStreamer.spec.ts b/test/infrastructure/streamer/NamespacePaginationStreamer.spec.ts index 8668ffd389..e2c822268d 100644 --- a/test/infrastructure/streamer/NamespacePaginationStreamer.spec.ts +++ b/test/infrastructure/streamer/NamespacePaginationStreamer.spec.ts @@ -15,9 +15,9 @@ */ import { instance, mock } from 'ts-mockito'; +import { NamespaceRepository } from '../../../src/infrastructure/NamespaceRepository'; import { NamespacePaginationStreamer } from '../../../src/infrastructure/paginationStreamer/NamespacePaginationStreamer'; import { PaginationStreamerTestHelper } from './PaginationStreamerTestHelper'; -import { NamespaceRepository } from '../../../src/infrastructure/NamespaceRepository'; describe('NamespacePaginationStreamer', () => { it('basicMultiPageTest', () => { diff --git a/test/infrastructure/streamer/ReceiptPaginationStreamer.spec.ts b/test/infrastructure/streamer/ReceiptPaginationStreamer.spec.ts index 7ecfedb13f..8e2bbdf035 100644 --- a/test/infrastructure/streamer/ReceiptPaginationStreamer.spec.ts +++ b/test/infrastructure/streamer/ReceiptPaginationStreamer.spec.ts @@ -16,8 +16,8 @@ import { instance, mock } from 'ts-mockito'; import { ReceiptPaginationStreamer } from '../../../src/infrastructure/paginationStreamer/ReceiptPaginationStreamer'; -import { PaginationStreamerTestHelper } from './PaginationStreamerTestHelper'; import { ReceiptRepository } from '../../../src/infrastructure/ReceiptRepository'; +import { PaginationStreamerTestHelper } from './PaginationStreamerTestHelper'; describe('ReceiptPaginationStreamer - transaction', () => { it('basicMultiPageTest', () => { diff --git a/test/infrastructure/streamer/SecretLockPaginationStreamer.spec.ts b/test/infrastructure/streamer/SecretLockPaginationStreamer.spec.ts index 81009ce835..eec5733da8 100644 --- a/test/infrastructure/streamer/SecretLockPaginationStreamer.spec.ts +++ b/test/infrastructure/streamer/SecretLockPaginationStreamer.spec.ts @@ -16,9 +16,9 @@ import { instance, mock } from 'ts-mockito'; import { SecretLockPaginationStreamer } from '../../../src/infrastructure/paginationStreamer/SecretLockPaginationStreamer'; -import { PaginationStreamerTestHelper } from './PaginationStreamerTestHelper'; import { SecretLockRepository } from '../../../src/infrastructure/SecretLockRepository'; import { Address } from '../../../src/model/account/Address'; +import { PaginationStreamerTestHelper } from './PaginationStreamerTestHelper'; describe('SecretLockPaginationStreamer', () => { const address = Address.createFromRawAddress('QATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA367I6OQ'); diff --git a/test/infrastructure/transaction/CreateTransactionFromDTO.spec.ts b/test/infrastructure/transaction/CreateTransactionFromDTO.spec.ts index e0673046c7..cba3ba9928 100644 --- a/test/infrastructure/transaction/CreateTransactionFromDTO.spec.ts +++ b/test/infrastructure/transaction/CreateTransactionFromDTO.spec.ts @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { LocalDateTime } from '@js-joda/core'; import { deepEqual } from 'assert'; import { expect } from 'chai'; import { CreateTransactionFromDTO } from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import { Address } from '../../../src/model/account/Address'; import { TransferTransaction } from '../../../src/model/transaction/TransferTransaction'; import ValidateTransaction from './ValidateTransaction'; -import { LocalDateTime } from '@js-joda/core'; describe('CreateTransactionFromDTO', () => { describe('TransferTransaction', () => { diff --git a/test/model/account/Account.spec.ts b/test/model/account/Account.spec.ts index 04efa03372..6d1dba31af 100644 --- a/test/model/account/Account.spec.ts +++ b/test/model/account/Account.spec.ts @@ -15,15 +15,15 @@ */ import { expect } from 'chai'; +import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import { Account } from '../../../src/model/account/Account'; -import { NetworkType } from '../../../src/model/network/NetworkType'; -import { TransferTransaction } from '../../../src/model/transaction/TransferTransaction'; -import { Deadline } from '../../../src/model/transaction/Deadline'; import { PlainMessage } from '../../../src/model/message/PlainMessage'; +import { NetworkType } from '../../../src/model/network/NetworkType'; import { AggregateTransaction } from '../../../src/model/transaction/AggregateTransaction'; -import { CosignatureTransaction } from '../../../src/model/transaction/CosignatureTransaction'; import { CosignatureSignedTransaction } from '../../../src/model/transaction/CosignatureSignedTransaction'; -import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; +import { CosignatureTransaction } from '../../../src/model/transaction/CosignatureTransaction'; +import { Deadline } from '../../../src/model/transaction/Deadline'; +import { TransferTransaction } from '../../../src/model/transaction/TransferTransaction'; import { NetworkCurrencyLocal } from '../mosaic/Currency.spec'; describe('Account', () => { diff --git a/test/model/account/AccountInfo.spec.ts b/test/model/account/AccountInfo.spec.ts index 8d0ad0a990..af37dcec21 100644 --- a/test/model/account/AccountInfo.spec.ts +++ b/test/model/account/AccountInfo.spec.ts @@ -17,16 +17,16 @@ import { deepEqual } from 'assert'; import { expect } from 'chai'; import { AccountInfo } from '../../../src/model/account/AccountInfo'; +import { AccountLinkPublicKey } from '../../../src/model/account/AccountLinkPublicKey'; +import { AccountLinkVotingKey } from '../../../src/model/account/AccountLinkVotingKey'; import { ActivityBucket } from '../../../src/model/account/ActivityBucket'; import { Address } from '../../../src/model/account/Address'; import { PublicAccount } from '../../../src/model/account/PublicAccount'; +import { SupplementalPublicKeys } from '../../../src/model/account/SupplementalPublicKeys'; import { Mosaic } from '../../../src/model/mosaic/Mosaic'; import { MosaicId } from '../../../src/model/mosaic/MosaicId'; import { NetworkType } from '../../../src/model/network/NetworkType'; import { UInt64 } from '../../../src/model/UInt64'; -import { SupplementalPublicKeys } from '../../../src/model/account/SupplementalPublicKeys'; -import { AccountLinkPublicKey } from '../../../src/model/account/AccountLinkPublicKey'; -import { AccountLinkVotingKey } from '../../../src/model/account/AccountLinkVotingKey'; describe('AccountInfo', () => { it('should createComplete an AccountInfo object', () => { diff --git a/test/model/account/MultisigAccountGraphInfo.spec.ts b/test/model/account/MultisigAccountGraphInfo.spec.ts index 8365b4570b..486c8e08cb 100644 --- a/test/model/account/MultisigAccountGraphInfo.spec.ts +++ b/test/model/account/MultisigAccountGraphInfo.spec.ts @@ -16,10 +16,10 @@ import { deepEqual } from 'assert'; import { expect } from 'chai'; +import { Address } from '../../../src/model/account/Address'; import { MultisigAccountGraphInfo } from '../../../src/model/account/MultisigAccountGraphInfo'; import { MultisigAccountInfo } from '../../../src/model/account/MultisigAccountInfo'; import { NetworkType } from '../../../src/model/network/NetworkType'; -import { Address } from '../../../src/model/account/Address'; describe('MultisigAccountGraphInfo', () => { it('should createComplete an MultisigAccountGraphInfo object', () => { diff --git a/test/model/account/MultisigAccountInfo.spec.ts b/test/model/account/MultisigAccountInfo.spec.ts index 0ba384728c..ce15cb617d 100644 --- a/test/model/account/MultisigAccountInfo.spec.ts +++ b/test/model/account/MultisigAccountInfo.spec.ts @@ -15,9 +15,9 @@ */ import { expect } from 'chai'; +import { Address } from '../../../src/model/account/Address'; import { MultisigAccountInfo } from '../../../src/model/account/MultisigAccountInfo'; import { NetworkType } from '../../../src/model/network/NetworkType'; -import { Address } from '../../../src/model/account/Address'; describe('MultisigAccountInfo', () => { const multisigAccountInfoDTO = { diff --git a/test/model/blockchain/BlockInfo.spec.ts b/test/model/blockchain/BlockInfo.spec.ts index f2bf61bfd8..f8f0b260ae 100644 --- a/test/model/blockchain/BlockInfo.spec.ts +++ b/test/model/blockchain/BlockInfo.spec.ts @@ -16,10 +16,10 @@ import { deepEqual } from 'assert'; import { expect } from 'chai'; +import { Address } from '../../../src/model/account/Address'; import { PublicAccount } from '../../../src/model/account/PublicAccount'; import { BlockInfo } from '../../../src/model/blockchain/BlockInfo'; import { UInt64 } from '../../../src/model/UInt64'; -import { Address } from '../../../src/model/account/Address'; describe('BlockInfo', () => { it('should createComplete an BlockInfo object', () => { diff --git a/test/model/blockchain/NewBlock.spec.ts b/test/model/blockchain/NewBlock.spec.ts index 3ea1808c1b..a1369a14cb 100644 --- a/test/model/blockchain/NewBlock.spec.ts +++ b/test/model/blockchain/NewBlock.spec.ts @@ -16,11 +16,11 @@ import { deepEqual } from 'assert'; import { expect } from 'chai'; +import { Address } from '../../../src/model/account/Address'; import { PublicAccount } from '../../../src/model/account/PublicAccount'; -import { UInt64 } from '../../../src/model/UInt64'; import { NewBlock } from '../../../src/model/blockchain/NewBlock'; -import { Address } from '../../../src/model/account/Address'; import { NetworkType } from '../../../src/model/network/NetworkType'; +import { UInt64 } from '../../../src/model/UInt64'; describe('NewBlock', () => { it('should createComplete an NewBlock object', () => { diff --git a/test/model/lock/HashLockInfo.spec.ts b/test/model/lock/HashLockInfo.spec.ts index 13e033295d..26ef97c1cc 100644 --- a/test/model/lock/HashLockInfo.spec.ts +++ b/test/model/lock/HashLockInfo.spec.ts @@ -15,11 +15,11 @@ */ import { deepEqual } from 'assert'; -import { UInt64 } from '../../../src/model/UInt64'; -import { HashLockInfoDTO, HashLockEntryDTO } from 'symbol-openapi-typescript-fetch-client'; -import { MosaicId } from '../../../src/model/mosaic/MosaicId'; +import { HashLockEntryDTO, HashLockInfoDTO } from 'symbol-openapi-typescript-fetch-client'; import { Address } from '../../../src/model/account/Address'; import { HashLockInfo } from '../../../src/model/lock/HashLockInfo'; +import { MosaicId } from '../../../src/model/mosaic/MosaicId'; +import { UInt64 } from '../../../src/model/UInt64'; describe('HashLockInfo', () => { it('should createComplete an HashLockInfo object', () => { diff --git a/test/model/lock/SecretLockInfo.spec.ts b/test/model/lock/SecretLockInfo.spec.ts index f5b350690a..e9c0428d71 100644 --- a/test/model/lock/SecretLockInfo.spec.ts +++ b/test/model/lock/SecretLockInfo.spec.ts @@ -15,11 +15,11 @@ */ import { deepEqual } from 'assert'; -import { UInt64 } from '../../../src/model/UInt64'; -import { SecretLockInfoDTO, LockHashAlgorithmEnum, SecretLockEntryDTO } from 'symbol-openapi-typescript-fetch-client'; -import { MosaicId } from '../../../src/model/mosaic/MosaicId'; +import { LockHashAlgorithmEnum, SecretLockEntryDTO, SecretLockInfoDTO } from 'symbol-openapi-typescript-fetch-client'; import { Address } from '../../../src/model/account/Address'; import { SecretLockInfo } from '../../../src/model/lock/SecretLockInfo'; +import { MosaicId } from '../../../src/model/mosaic/MosaicId'; +import { UInt64 } from '../../../src/model/UInt64'; describe('SecretLockInfo', () => { it('should createComplete an SecretLockInfo object', () => { diff --git a/test/model/metadata/MetadataEntry.spec.ts b/test/model/metadata/MetadataEntry.spec.ts index 03ee584462..f46cd78232 100644 --- a/test/model/metadata/MetadataEntry.spec.ts +++ b/test/model/metadata/MetadataEntry.spec.ts @@ -18,10 +18,10 @@ import { deepEqual } from 'assert'; import { Account } from '../../../src/model/account/Account'; import { MetadataEntry } from '../../../src/model/metadata/MetadataEntry'; import { MetadataType } from '../../../src/model/metadata/MetadataType'; -import { UInt64 } from '../../../src/model/UInt64'; -import { TestingAccount } from '../../conf/conf.spec'; import { MosaicId } from '../../../src/model/mosaic/MosaicId'; import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; +import { UInt64 } from '../../../src/model/UInt64'; +import { TestingAccount } from '../../conf/conf.spec'; describe('MetadataEntry', () => { let account: Account; diff --git a/test/model/mosaic/MosaicAmountView.spec.ts b/test/model/mosaic/MosaicAmountView.spec.ts index c38f160610..77b39643a8 100644 --- a/test/model/mosaic/MosaicAmountView.spec.ts +++ b/test/model/mosaic/MosaicAmountView.spec.ts @@ -15,13 +15,13 @@ */ import { expect } from 'chai'; +import { Address } from '../../../src/model/account/Address'; import { MosaicFlags } from '../../../src/model/mosaic/MosaicFlags'; import { MosaicId } from '../../../src/model/mosaic/MosaicId'; import { MosaicInfo } from '../../../src/model/mosaic/MosaicInfo'; import { NetworkType } from '../../../src/model/network/NetworkType'; import { UInt64 } from '../../../src/model/UInt64'; import { MosaicAmountView } from '../../../src/service/MosaicAmountView'; -import { Address } from '../../../src/model/account/Address'; describe('MosaicAmountView', () => { let mosaicInfo: MosaicInfo; diff --git a/test/model/mosaic/MosaicId.spec.ts b/test/model/mosaic/MosaicId.spec.ts index f352b07cde..9e80895cdc 100644 --- a/test/model/mosaic/MosaicId.spec.ts +++ b/test/model/mosaic/MosaicId.spec.ts @@ -14,12 +14,12 @@ * limitations under the License. */ import { deepEqual } from 'assert'; +import { expect } from 'chai'; import { PublicAccount } from '../../../src/model/account/PublicAccount'; import { Id } from '../../../src/model/Id'; import { MosaicId } from '../../../src/model/mosaic/MosaicId'; import { MosaicNonce } from '../../../src/model/mosaic/MosaicNonce'; import { NetworkType } from '../../../src/model/network/NetworkType'; -import { expect } from 'chai'; describe('MosaicId', () => { const publicKey = 'b4f12e7c9f6946091e2cb8b6d3a12b50d17ccbbf646386ea27ce2946a7423dcf'; diff --git a/test/model/mosaic/MosaicInfo.spec.ts b/test/model/mosaic/MosaicInfo.spec.ts index 3795f00a25..57bbfbe0f4 100644 --- a/test/model/mosaic/MosaicInfo.spec.ts +++ b/test/model/mosaic/MosaicInfo.spec.ts @@ -16,12 +16,12 @@ import { deepEqual } from 'assert'; import { expect } from 'chai'; +import { Address } from '../../../src/model/account/Address'; import { MosaicFlags } from '../../../src/model/mosaic/MosaicFlags'; import { MosaicId } from '../../../src/model/mosaic/MosaicId'; import { MosaicInfo } from '../../../src/model/mosaic/MosaicInfo'; import { NetworkType } from '../../../src/model/network/NetworkType'; import { UInt64 } from '../../../src/model/UInt64'; -import { Address } from '../../../src/model/account/Address'; describe('MosaicInfo', () => { const mosaicInfoDTO = { diff --git a/test/model/mosaic/MosaicNames.spec.ts b/test/model/mosaic/MosaicNames.spec.ts index f428599622..ad6925d1e2 100644 --- a/test/model/mosaic/MosaicNames.spec.ts +++ b/test/model/mosaic/MosaicNames.spec.ts @@ -17,8 +17,8 @@ import { expect } from 'chai'; import { MosaicId } from '../../../src/model/mosaic/MosaicId'; import { MosaicNames } from '../../../src/model/mosaic/MosaicNames'; -import { NamespaceName } from '../../../src/model/namespace/NamespaceName'; import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; +import { NamespaceName } from '../../../src/model/namespace/NamespaceName'; describe('MosaicNames', () => { let namespaceName: NamespaceName[]; diff --git a/test/model/mosaic/MosaicView.spec.ts b/test/model/mosaic/MosaicView.spec.ts index c230b0dbc6..b77e98c1ff 100644 --- a/test/model/mosaic/MosaicView.spec.ts +++ b/test/model/mosaic/MosaicView.spec.ts @@ -15,13 +15,13 @@ */ import { expect } from 'chai'; +import { Address } from '../../../src/model/account/Address'; import { MosaicFlags } from '../../../src/model/mosaic/MosaicFlags'; import { MosaicId } from '../../../src/model/mosaic/MosaicId'; import { MosaicInfo } from '../../../src/model/mosaic/MosaicInfo'; import { NetworkType } from '../../../src/model/network/NetworkType'; import { UInt64 } from '../../../src/model/UInt64'; import { MosaicView } from '../../../src/service/MosaicView'; -import { Address } from '../../../src/model/account/Address'; describe('MosaicView', () => { let mosaicInfo: MosaicInfo; diff --git a/test/model/namespace/NamespaceInfo.spec.ts b/test/model/namespace/NamespaceInfo.spec.ts index 1148822444..92d0277df1 100644 --- a/test/model/namespace/NamespaceInfo.spec.ts +++ b/test/model/namespace/NamespaceInfo.spec.ts @@ -16,12 +16,12 @@ import { deepEqual } from 'assert'; import { expect } from 'chai'; +import { Address } from '../../../src/model/account/Address'; import { MosaicId } from '../../../src/model/mosaic/MosaicId'; import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; import { NamespaceInfo } from '../../../src/model/namespace/NamespaceInfo'; import { NetworkType } from '../../../src/model/network/NetworkType'; import { UInt64 } from '../../../src/model/UInt64'; -import { Address } from '../../../src/model/account/Address'; describe('NamespaceInfo', () => { let rootNamespaceDTO; diff --git a/test/model/receipt/Receipt.spec.ts b/test/model/receipt/Receipt.spec.ts index 29155f625f..839cdb808d 100644 --- a/test/model/receipt/Receipt.spec.ts +++ b/test/model/receipt/Receipt.spec.ts @@ -16,6 +16,7 @@ import { deepEqual } from 'assert'; import { expect } from 'chai'; +import { Convert } from '../../../src/core/format/Convert'; import { createAddressResolutionStatement, createMosaicResolutionStatement, @@ -39,7 +40,6 @@ import { ResolutionStatement } from '../../../src/model/receipt/ResolutionStatem import { ResolutionType } from '../../../src/model/receipt/ResolutionType'; import { TransactionStatement } from '../../../src/model/receipt/TransactionStatement'; import { UInt64 } from '../../../src/model/UInt64'; -import { Convert } from '../../../src/core/format/Convert'; describe('Receipt', () => { let account: Account; diff --git a/test/model/receipt/ResolutionEntry.spec.ts b/test/model/receipt/ResolutionEntry.spec.ts index ddab3d68ec..fecaba63ed 100644 --- a/test/model/receipt/ResolutionEntry.spec.ts +++ b/test/model/receipt/ResolutionEntry.spec.ts @@ -15,12 +15,12 @@ */ import { expect } from 'chai'; +import { Convert } from '../../../src/core/format/Convert'; import { Address } from '../../../src/model/account/Address'; import { MosaicId } from '../../../src/model/mosaic/MosaicId'; import { ReceiptSource } from '../../../src/model/receipt/ReceiptSource'; import { ResolutionEntry } from '../../../src/model/receipt/ResolutionEntry'; import { TestingAccount } from '../../conf/conf.spec'; -import { Convert } from '../../../src/core/format/Convert'; describe('ResolutionEntry', () => { const address = TestingAccount.address; diff --git a/test/model/transaction/AccountKeyLinkTransaction.spec.ts b/test/model/transaction/AccountKeyLinkTransaction.spec.ts index 219660eace..1d2ea5bbcc 100644 --- a/test/model/transaction/AccountKeyLinkTransaction.spec.ts +++ b/test/model/transaction/AccountKeyLinkTransaction.spec.ts @@ -17,13 +17,13 @@ import { expect } from 'chai'; import { Convert } from '../../../src/core/format'; import { Account } from '../../../src/model/account/Account'; +import { Address } from '../../../src/model/account/Address'; import { NetworkType } from '../../../src/model/network/NetworkType'; import { AccountKeyLinkTransaction } from '../../../src/model/transaction/AccountKeyLinkTransaction'; import { Deadline } from '../../../src/model/transaction/Deadline'; import { LinkAction } from '../../../src/model/transaction/LinkAction'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import { Address } from '../../../src/model/account/Address'; describe('AccountKeyLinkTransaction', () => { let account: Account; diff --git a/test/model/transaction/AccountMetadataTransaction.spec.ts b/test/model/transaction/AccountMetadataTransaction.spec.ts index d700c587f0..051267fad7 100644 --- a/test/model/transaction/AccountMetadataTransaction.spec.ts +++ b/test/model/transaction/AccountMetadataTransaction.spec.ts @@ -14,19 +14,19 @@ * limitations under the License. */ +import { deepEqual } from 'assert'; +import { EmbeddedTransactionBuilder } from 'catbuffer-typescript/dist/EmbeddedTransactionBuilder'; import { expect } from 'chai'; import { Convert } from '../../../src/core/format/Convert'; import { Account } from '../../../src/model/account/Account'; +import { Address } from '../../../src/model/account/Address'; +import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; import { NetworkType } from '../../../src/model/network/NetworkType'; import { AccountMetadataTransaction } from '../../../src/model/transaction/AccountMetadataTransaction'; import { Deadline } from '../../../src/model/transaction/Deadline'; +import { TransactionType } from '../../../src/model/transaction/TransactionType'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import { EmbeddedTransactionBuilder } from 'catbuffer-typescript/dist/EmbeddedTransactionBuilder'; -import { TransactionType } from '../../../src/model/transaction/TransactionType'; -import { deepEqual } from 'assert'; -import { Address } from '../../../src/model/account/Address'; -import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; describe('AccountMetadataTransaction', () => { let account: Account; diff --git a/test/model/transaction/AccountRestrictionTransaction.spec.ts b/test/model/transaction/AccountRestrictionTransaction.spec.ts index 79bddf35ef..e7e189171e 100644 --- a/test/model/transaction/AccountRestrictionTransaction.spec.ts +++ b/test/model/transaction/AccountRestrictionTransaction.spec.ts @@ -19,18 +19,18 @@ import { Convert } from '../../../src/core/format'; import { Account } from '../../../src/model/account/Account'; import { Address } from '../../../src/model/account/Address'; import { MosaicId } from '../../../src/model/mosaic/MosaicId'; +import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; import { NetworkType } from '../../../src/model/network/NetworkType'; import { AccountRestrictionModificationAction } from '../../../src/model/restriction/AccountRestrictionModificationAction'; +import { AddressRestrictionFlag } from '../../../src/model/restriction/AddressRestrictionFlag'; +import { MosaicRestrictionFlag } from '../../../src/model/restriction/MosaicRestrictionFlag'; +import { OperationRestrictionFlag } from '../../../src/model/restriction/OperationRestrictionFlag'; import { AccountRestrictionModification } from '../../../src/model/transaction/AccountRestrictionModification'; import { AccountRestrictionTransaction } from '../../../src/model/transaction/AccountRestrictionTransaction'; import { Deadline } from '../../../src/model/transaction/Deadline'; import { TransactionType } from '../../../src/model/transaction/TransactionType'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; -import { AddressRestrictionFlag } from '../../../src/model/restriction/AddressRestrictionFlag'; -import { OperationRestrictionFlag } from '../../../src/model/restriction/OperationRestrictionFlag'; -import { MosaicRestrictionFlag } from '../../../src/model/restriction/MosaicRestrictionFlag'; describe('AccountRestrictionTransaction', () => { let account: Account; diff --git a/test/model/transaction/AddressAliasTransaction.spec.ts b/test/model/transaction/AddressAliasTransaction.spec.ts index b86e120ddb..ab5595bf4e 100644 --- a/test/model/transaction/AddressAliasTransaction.spec.ts +++ b/test/model/transaction/AddressAliasTransaction.spec.ts @@ -16,6 +16,7 @@ import { expect } from 'chai'; import { Convert } from '../../../src/core/format'; +import { AliasTransaction } from '../../../src/model'; import { Account } from '../../../src/model/account/Account'; import { Address } from '../../../src/model/account/Address'; import { AliasAction } from '../../../src/model/namespace/AliasAction'; @@ -25,7 +26,6 @@ import { AddressAliasTransaction } from '../../../src/model/transaction/AddressA import { Deadline } from '../../../src/model/transaction/Deadline'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import { AliasTransaction } from '../../../src/model'; describe('AddressAliasTransaction', () => { let account: Account; diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 4e3ea3ab85..e1f4ddb539 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { expect } from 'chai'; import { ChronoUnit } from '@js-joda/core'; +import { expect } from 'chai'; import { Convert } from '../../../src/core/format'; import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import { CreateTransactionFromDTO } from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; diff --git a/test/model/transaction/Deadline.spec.ts b/test/model/transaction/Deadline.spec.ts index eb01ad88a4..ae6f60bb6e 100644 --- a/test/model/transaction/Deadline.spec.ts +++ b/test/model/transaction/Deadline.spec.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { expect } from 'chai'; import { ChronoUnit, Instant, LocalDateTime, ZoneId } from '@js-joda/core'; +import { expect } from 'chai'; import { Deadline } from '../../../src/model/transaction/Deadline'; describe('Deadline', () => { diff --git a/test/model/transaction/HashTypeLengthValidator.spec.ts b/test/model/transaction/HashTypeLengthValidator.spec.ts index 23bdaa9822..e4b72ad28d 100644 --- a/test/model/transaction/HashTypeLengthValidator.spec.ts +++ b/test/model/transaction/HashTypeLengthValidator.spec.ts @@ -14,9 +14,9 @@ * limitations under the License. */ import { expect } from 'chai'; +import * as CryptoJS from 'crypto-js'; import { sha3_256, sha3_512 } from 'js-sha3'; import { LockHashAlgorithm, LockHashAlgorithmLengthValidator } from '../../../src/model/lock/LockHashAlgorithm'; -import * as CryptoJS from 'crypto-js'; describe('LockHashAlgorithmLengthValidator', () => { it('LockHashAlgorithm.SHA3_256 should be exactly 64 chars length', () => { diff --git a/test/model/transaction/MosaicAliasTransaction.spec.ts b/test/model/transaction/MosaicAliasTransaction.spec.ts index 705255f732..389a071280 100644 --- a/test/model/transaction/MosaicAliasTransaction.spec.ts +++ b/test/model/transaction/MosaicAliasTransaction.spec.ts @@ -14,6 +14,8 @@ * limitations under the License. */ +import { deepEqual } from 'assert'; +import { EmbeddedTransactionBuilder } from 'catbuffer-typescript/dist/EmbeddedTransactionBuilder'; import { expect } from 'chai'; import { Convert } from '../../../src/core/format'; import { Account } from '../../../src/model/account/Account'; @@ -21,14 +23,12 @@ import { MosaicId } from '../../../src/model/mosaic/MosaicId'; import { AliasAction } from '../../../src/model/namespace/AliasAction'; import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; import { NetworkType } from '../../../src/model/network/NetworkType'; +import { AliasTransaction } from '../../../src/model/transaction/AliasTransaction'; import { Deadline } from '../../../src/model/transaction/Deadline'; import { MosaicAliasTransaction } from '../../../src/model/transaction/MosaicAliasTransaction'; +import { TransactionType } from '../../../src/model/transaction/TransactionType'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import { deepEqual } from 'assert'; -import { EmbeddedTransactionBuilder } from 'catbuffer-typescript/dist/EmbeddedTransactionBuilder'; -import { TransactionType } from '../../../src/model/transaction/TransactionType'; -import { AliasTransaction } from '../../../src/model/transaction/AliasTransaction'; describe('MosaicAliasTransaction', () => { let account: Account; diff --git a/test/model/transaction/MosaicMetadataTransaction.spec.ts b/test/model/transaction/MosaicMetadataTransaction.spec.ts index d5b8212355..c3e9c5e0b4 100644 --- a/test/model/transaction/MosaicMetadataTransaction.spec.ts +++ b/test/model/transaction/MosaicMetadataTransaction.spec.ts @@ -14,9 +14,11 @@ * limitations under the License. */ +import { EmbeddedTransactionBuilder } from 'catbuffer-typescript'; import { expect } from 'chai'; import { Convert } from '../../../src/core/format/Convert'; import { Account } from '../../../src/model/account/Account'; +import { Address } from '../../../src/model/account/Address'; import { MosaicId } from '../../../src/model/mosaic/MosaicId'; import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; import { NetworkType } from '../../../src/model/network/NetworkType'; @@ -28,11 +30,9 @@ import { Statement } from '../../../src/model/receipt/Statement'; import { Deadline } from '../../../src/model/transaction/Deadline'; import { MosaicMetadataTransaction } from '../../../src/model/transaction/MosaicMetadataTransaction'; import { TransactionInfo } from '../../../src/model/transaction/TransactionInfo'; +import { TransactionType } from '../../../src/model/transaction/TransactionType'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import { EmbeddedTransactionBuilder } from 'catbuffer-typescript'; -import { Address } from '../../../src/model/account/Address'; -import { TransactionType } from '../../../src/model/transaction/TransactionType'; describe('MosaicMetadataTransaction', () => { let account: Account; diff --git a/test/model/transaction/MultisigAccountModificationTransaction.spec.ts b/test/model/transaction/MultisigAccountModificationTransaction.spec.ts index 968ff5b7e6..4bb0af1912 100644 --- a/test/model/transaction/MultisigAccountModificationTransaction.spec.ts +++ b/test/model/transaction/MultisigAccountModificationTransaction.spec.ts @@ -17,13 +17,13 @@ import { expect } from 'chai'; import { Convert } from '../../../src/core/format'; import { Account } from '../../../src/model/account/Account'; +import { Address } from '../../../src/model/account/Address'; +import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; import { NetworkType } from '../../../src/model/network/NetworkType'; import { Deadline } from '../../../src/model/transaction/Deadline'; import { MultisigAccountModificationTransaction } from '../../../src/model/transaction/MultisigAccountModificationTransaction'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import { Address } from '../../../src/model/account/Address'; -import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; describe('MultisigAccountModificationTransaction', () => { let account: Account; diff --git a/test/model/transaction/NamespaceMetadataTransaction.spec.ts b/test/model/transaction/NamespaceMetadataTransaction.spec.ts index 5850a06ac1..fbfd30d41f 100644 --- a/test/model/transaction/NamespaceMetadataTransaction.spec.ts +++ b/test/model/transaction/NamespaceMetadataTransaction.spec.ts @@ -14,19 +14,19 @@ * limitations under the License. */ +import { deepEqual } from 'assert'; +import { EmbeddedTransactionBuilder } from 'catbuffer-typescript/dist/EmbeddedTransactionBuilder'; import { expect } from 'chai'; import { Convert } from '../../../src/core/format/Convert'; import { Account } from '../../../src/model/account/Account'; +import { Address } from '../../../src/model/account/Address'; import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; import { NetworkType } from '../../../src/model/network/NetworkType'; import { Deadline } from '../../../src/model/transaction/Deadline'; import { NamespaceMetadataTransaction } from '../../../src/model/transaction/NamespaceMetadataTransaction'; +import { TransactionType } from '../../../src/model/transaction/TransactionType'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import { EmbeddedTransactionBuilder } from 'catbuffer-typescript/dist/EmbeddedTransactionBuilder'; -import { TransactionType } from '../../../src/model/transaction/TransactionType'; -import { deepEqual } from 'assert'; -import { Address } from '../../../src/model/account/Address'; describe('NamespaceMetadataTransaction', () => { let account: Account; diff --git a/test/model/transaction/NodeKeyLinkTransaction.spec.ts b/test/model/transaction/NodeKeyLinkTransaction.spec.ts index e6f1b01a74..056becf292 100644 --- a/test/model/transaction/NodeKeyLinkTransaction.spec.ts +++ b/test/model/transaction/NodeKeyLinkTransaction.spec.ts @@ -17,13 +17,13 @@ import { expect } from 'chai'; import { Convert } from '../../../src/core/format'; import { Account } from '../../../src/model/account/Account'; +import { Address } from '../../../src/model/account/Address'; import { NetworkType } from '../../../src/model/network/NetworkType'; -import { NodeKeyLinkTransaction } from '../../../src/model/transaction/NodeKeyLinkTransaction'; import { Deadline } from '../../../src/model/transaction/Deadline'; import { LinkAction } from '../../../src/model/transaction/LinkAction'; +import { NodeKeyLinkTransaction } from '../../../src/model/transaction/NodeKeyLinkTransaction'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import { Address } from '../../../src/model/account/Address'; describe('NodeKeyLinkTransaction', () => { let account: Account; diff --git a/test/model/transaction/SecretLockTransaction.spec.ts b/test/model/transaction/SecretLockTransaction.spec.ts index 6a339d5e61..caf122d1ea 100644 --- a/test/model/transaction/SecretLockTransaction.spec.ts +++ b/test/model/transaction/SecretLockTransaction.spec.ts @@ -15,10 +15,12 @@ */ import { deepEqual } from 'assert'; import { expect } from 'chai'; +import * as CryptoJS from 'crypto-js'; import { sha3_256 } from 'js-sha3'; import { Convert, Convert as convert } from '../../../src/core/format'; import { Account } from '../../../src/model/account/Account'; import { Address } from '../../../src/model/account/Address'; +import { LockHashAlgorithm } from '../../../src/model/lock/LockHashAlgorithm'; import { Mosaic } from '../../../src/model/mosaic/Mosaic'; import { MosaicId } from '../../../src/model/mosaic/MosaicId'; import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; @@ -29,12 +31,10 @@ import { ResolutionStatement } from '../../../src/model/receipt/ResolutionStatem import { ResolutionType } from '../../../src/model/receipt/ResolutionType'; import { Statement } from '../../../src/model/receipt/Statement'; import { Deadline } from '../../../src/model/transaction/Deadline'; -import { LockHashAlgorithm } from '../../../src/model/lock/LockHashAlgorithm'; import { SecretLockTransaction } from '../../../src/model/transaction/SecretLockTransaction'; import { TransactionInfo } from '../../../src/model/transaction/TransactionInfo'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import * as CryptoJS from 'crypto-js'; import { NetworkCurrencyLocal } from '../mosaic/Currency.spec'; describe('SecretLockTransaction', () => { diff --git a/test/model/transaction/SecretProofTransaction.spec.ts b/test/model/transaction/SecretProofTransaction.spec.ts index 3c1d017258..ebd9bf8b64 100644 --- a/test/model/transaction/SecretProofTransaction.spec.ts +++ b/test/model/transaction/SecretProofTransaction.spec.ts @@ -13,11 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { EmbeddedTransactionBuilder } from 'catbuffer-typescript/dist/EmbeddedTransactionBuilder'; import { expect } from 'chai'; +import * as CryptoJS from 'crypto-js'; import { sha3_256 } from 'js-sha3'; import { Convert, Convert as convert } from '../../../src/core/format'; import { Account } from '../../../src/model/account/Account'; import { Address } from '../../../src/model/account/Address'; +import { LockHashAlgorithm } from '../../../src/model/lock/LockHashAlgorithm'; import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; import { NetworkType } from '../../../src/model/network/NetworkType'; import { ReceiptSource } from '../../../src/model/receipt/ReceiptSource'; @@ -26,14 +29,11 @@ import { ResolutionStatement } from '../../../src/model/receipt/ResolutionStatem import { ResolutionType } from '../../../src/model/receipt/ResolutionType'; import { Statement } from '../../../src/model/receipt/Statement'; import { Deadline } from '../../../src/model/transaction/Deadline'; -import { LockHashAlgorithm } from '../../../src/model/lock/LockHashAlgorithm'; import { SecretProofTransaction } from '../../../src/model/transaction/SecretProofTransaction'; import { TransactionInfo } from '../../../src/model/transaction/TransactionInfo'; +import { TransactionType } from '../../../src/model/transaction/TransactionType'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import { EmbeddedTransactionBuilder } from 'catbuffer-typescript/dist/EmbeddedTransactionBuilder'; -import { TransactionType } from '../../../src/model/transaction/TransactionType'; -import * as CryptoJS from 'crypto-js'; describe('SecretProofTransaction', () => { let account: Account; diff --git a/test/model/transaction/SignedTransaction.spec.ts b/test/model/transaction/SignedTransaction.spec.ts index decf958ebf..a404c1906d 100644 --- a/test/model/transaction/SignedTransaction.spec.ts +++ b/test/model/transaction/SignedTransaction.spec.ts @@ -14,7 +14,6 @@ * limitations under the License. */ import { expect } from 'chai'; - import { NetworkType } from '../../../src/model/network/NetworkType'; import { SignedTransaction } from '../../../src/model/transaction/SignedTransaction'; import { TransactionType } from '../../../src/model/transaction/TransactionType'; diff --git a/test/model/transaction/Transaction.spec.ts b/test/model/transaction/Transaction.spec.ts index 5fee48729c..390a08f079 100644 --- a/test/model/transaction/Transaction.spec.ts +++ b/test/model/transaction/Transaction.spec.ts @@ -17,9 +17,11 @@ import { EmbeddedTransactionBuilder, TransactionBuilder } from 'catbuffer-typescript'; import { expect } from 'chai'; import { Convert } from '../../../src/core/format/Convert'; +import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import { Account } from '../../../src/model/account/Account'; import { Address } from '../../../src/model/account/Address'; import { PlainMessage } from '../../../src/model/message/PlainMessage'; +import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; import { NetworkType } from '../../../src/model/network/NetworkType'; import { AggregateTransaction } from '../../../src/model/transaction/AggregateTransaction'; import { Deadline } from '../../../src/model/transaction/Deadline'; @@ -30,8 +32,6 @@ import { TransactionType } from '../../../src/model/transaction/TransactionType' import { TransferTransaction } from '../../../src/model/transaction/TransferTransaction'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; -import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; describe('Transaction', () => { let account: Account; diff --git a/test/model/transaction/TransactionStatus.spec.ts b/test/model/transaction/TransactionStatus.spec.ts index 9591d844f2..36bb4236e9 100644 --- a/test/model/transaction/TransactionStatus.spec.ts +++ b/test/model/transaction/TransactionStatus.spec.ts @@ -16,8 +16,7 @@ import { deepEqual } from 'assert'; import { expect } from 'chai'; -import { TransactionStatusEnum } from 'symbol-openapi-typescript-fetch-client'; -import { TransactionGroupEnum } from 'symbol-openapi-typescript-fetch-client'; +import { TransactionGroupEnum, TransactionStatusEnum } from 'symbol-openapi-typescript-fetch-client'; import { Deadline } from '../../../src/model/transaction/Deadline'; import { TransactionStatus } from '../../../src/model/transaction/TransactionStatus'; import { UInt64 } from '../../../src/model/UInt64'; diff --git a/test/model/transaction/TransferTransaction.spec.ts b/test/model/transaction/TransferTransaction.spec.ts index 7500729198..ca0f92f33f 100644 --- a/test/model/transaction/TransferTransaction.spec.ts +++ b/test/model/transaction/TransferTransaction.spec.ts @@ -27,17 +27,17 @@ import { Mosaic } from '../../../src/model/mosaic/Mosaic'; import { MosaicId } from '../../../src/model/mosaic/MosaicId'; import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; import { NetworkType } from '../../../src/model/network/NetworkType'; +import { ReceiptSource } from '../../../src/model/receipt/ReceiptSource'; +import { ResolutionEntry } from '../../../src/model/receipt/ResolutionEntry'; import { ResolutionStatement } from '../../../src/model/receipt/ResolutionStatement'; +import { ResolutionType } from '../../../src/model/receipt/ResolutionType'; import { Statement } from '../../../src/model/receipt/Statement'; +import { AggregateTransaction } from '../../../src/model/transaction/AggregateTransaction'; import { Deadline } from '../../../src/model/transaction/Deadline'; +import { TransactionInfo } from '../../../src/model/transaction/TransactionInfo'; import { TransferTransaction } from '../../../src/model/transaction/TransferTransaction'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import { AggregateTransaction } from '../../../src/model/transaction/AggregateTransaction'; -import { ResolutionType } from '../../../src/model/receipt/ResolutionType'; -import { ReceiptSource } from '../../../src/model/receipt/ReceiptSource'; -import { ResolutionEntry } from '../../../src/model/receipt/ResolutionEntry'; -import { TransactionInfo } from '../../../src/model/transaction/TransactionInfo'; import { NetworkCurrencyLocal } from '../mosaic/Currency.spec'; describe('TransferTransaction', () => { diff --git a/test/model/transaction/VotingKeyLinkTransaction.spec.ts b/test/model/transaction/VotingKeyLinkTransaction.spec.ts index e72bfd6681..57b48072bd 100644 --- a/test/model/transaction/VotingKeyLinkTransaction.spec.ts +++ b/test/model/transaction/VotingKeyLinkTransaction.spec.ts @@ -17,13 +17,13 @@ import { expect } from 'chai'; import { Convert } from '../../../src/core/format'; import { Account } from '../../../src/model/account/Account'; +import { Address } from '../../../src/model/account/Address'; import { NetworkType } from '../../../src/model/network/NetworkType'; -import { VotingKeyLinkTransaction } from '../../../src/model/transaction/VotingKeyLinkTransaction'; import { Deadline } from '../../../src/model/transaction/Deadline'; import { LinkAction } from '../../../src/model/transaction/LinkAction'; +import { VotingKeyLinkTransaction } from '../../../src/model/transaction/VotingKeyLinkTransaction'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import { Address } from '../../../src/model/account/Address'; describe('VotingKeyLinkTransaction', () => { let account: Account; diff --git a/test/model/transaction/VrfKeyLinkTransaction.spec.ts b/test/model/transaction/VrfKeyLinkTransaction.spec.ts index 9cf82fc19f..b69d9d2cde 100644 --- a/test/model/transaction/VrfKeyLinkTransaction.spec.ts +++ b/test/model/transaction/VrfKeyLinkTransaction.spec.ts @@ -17,13 +17,13 @@ import { expect } from 'chai'; import { Convert } from '../../../src/core/format'; import { Account } from '../../../src/model/account/Account'; +import { Address } from '../../../src/model/account/Address'; import { NetworkType } from '../../../src/model/network/NetworkType'; -import { VrfKeyLinkTransaction } from '../../../src/model/transaction/VrfKeyLinkTransaction'; import { Deadline } from '../../../src/model/transaction/Deadline'; import { LinkAction } from '../../../src/model/transaction/LinkAction'; +import { VrfKeyLinkTransaction } from '../../../src/model/transaction/VrfKeyLinkTransaction'; import { UInt64 } from '../../../src/model/UInt64'; import { TestingAccount } from '../../conf/conf.spec'; -import { Address } from '../../../src/model/account/Address'; describe('VrfKeyLinkTransaction', () => { let account: Account; diff --git a/test/service/AccountService.spec.ts b/test/service/AccountService.spec.ts index 27e426bc75..34a6091f73 100644 --- a/test/service/AccountService.spec.ts +++ b/test/service/AccountService.spec.ts @@ -17,24 +17,19 @@ import { expect } from 'chai'; import { of as observableOf } from 'rxjs'; import { deepEqual, instance, mock, when } from 'ts-mockito'; -import { RepositoryFactory } from '../../src/infrastructure/RepositoryFactory'; -import { Account } from '../../src/model/account'; -import { UInt64 } from '../../src/model/UInt64'; -import { TestingAccount, MultisigAccount } from '../conf/conf.spec'; -import { AccountService } from '../../src/service/AccountService'; import { AccountRepository } from '../../src/infrastructure/AccountRepository'; import { NamespaceRepository } from '../../src/infrastructure/NamespaceRepository'; -import { AccountInfo } from '../../src/model/account'; -import { AccountType } from '../../src/model/account'; -import { ActivityBucket } from '../../src/model/account'; -import { NamespaceInfo } from '../../src/model/namespace/NamespaceInfo'; -import { NamespaceId } from '../../src/model/namespace/NamespaceId'; +import { Page } from '../../src/infrastructure/Page'; +import { RepositoryFactory } from '../../src/infrastructure/RepositoryFactory'; +import { Account, AccountInfo, AccountType, ActivityBucket, SupplementalPublicKeys } from '../../src/model/account'; +import { Mosaic, MosaicId } from '../../src/model/mosaic'; import { MosaicAlias } from '../../src/model/namespace/MosaicAlias'; -import { MosaicId } from '../../src/model/mosaic'; +import { NamespaceId } from '../../src/model/namespace/NamespaceId'; +import { NamespaceInfo } from '../../src/model/namespace/NamespaceInfo'; import { NamespaceName } from '../../src/model/namespace/NamespaceName'; -import { Mosaic } from '../../src/model/mosaic'; -import { SupplementalPublicKeys } from '../../src/model/account'; -import { Page } from '../../src/infrastructure/Page'; +import { UInt64 } from '../../src/model/UInt64'; +import { AccountService } from '../../src/service/AccountService'; +import { MultisigAccount, TestingAccount } from '../conf/conf.spec'; import { NetworkCurrencyLocal, NetworkCurrencyPublic, NetworkHarvestLocal } from '../model/mosaic/Currency.spec'; describe('AccountService', () => { diff --git a/test/service/AggregateTransactionService.spec.ts b/test/service/AggregateTransactionService.spec.ts index b71dc1c882..db9be27549 100644 --- a/test/service/AggregateTransactionService.spec.ts +++ b/test/service/AggregateTransactionService.spec.ts @@ -14,12 +14,14 @@ * limitations under the License. */ -import { expect } from 'chai'; import { ChronoUnit } from '@js-joda/core'; +import { expect } from 'chai'; import { of as observableOf } from 'rxjs'; +import { AggregateNetworkPropertiesDTO, NetworkConfigurationDTO, PluginsPropertiesDTO } from 'symbol-openapi-typescript-fetch-client'; import { deepEqual, instance, mock, when } from 'ts-mockito'; import { MultisigRepository } from '../../src/infrastructure/MultisigRepository'; - +import { NetworkRepository } from '../../src/infrastructure/NetworkRepository'; +import { RepositoryFactory } from '../../src/infrastructure/RepositoryFactory'; import { Account } from '../../src/model/account/Account'; import { Address } from '../../src/model/account/Address'; import { MultisigAccountGraphInfo } from '../../src/model/account/MultisigAccountGraphInfo'; @@ -31,9 +33,6 @@ import { Deadline } from '../../src/model/transaction/Deadline'; import { MultisigAccountModificationTransaction } from '../../src/model/transaction/MultisigAccountModificationTransaction'; import { TransferTransaction } from '../../src/model/transaction/TransferTransaction'; import { AggregateTransactionService } from '../../src/service/AggregateTransactionService'; -import { RepositoryFactory } from '../../src/infrastructure/RepositoryFactory'; -import { NetworkRepository } from '../../src/infrastructure/NetworkRepository'; -import { NetworkConfigurationDTO, PluginsPropertiesDTO, AggregateNetworkPropertiesDTO } from 'symbol-openapi-typescript-fetch-client'; /** * For multi level multisig scenario visit: https://github.com/nemtech/symbol-docs/issues/10 diff --git a/test/service/BlockService.spec.ts b/test/service/BlockService.spec.ts index 110dfb6e41..68edb5a204 100644 --- a/test/service/BlockService.spec.ts +++ b/test/service/BlockService.spec.ts @@ -18,24 +18,24 @@ import { expect } from 'chai'; import { of as observableOf } from 'rxjs'; import { deepEqual, instance, mock, when } from 'ts-mockito'; import { BlockRepository } from '../../src/infrastructure/BlockRepository'; +import { Page } from '../../src/infrastructure/Page'; import { ReceiptRepository } from '../../src/infrastructure/ReceiptRepository'; import { RepositoryFactory } from '../../src/infrastructure/RepositoryFactory'; +import { TransactionGroup } from '../../src/infrastructure/TransactionGroup'; +import { TransactionRepository } from '../../src/infrastructure/TransactionRepository'; +import { Deadline, TransactionInfo } from '../../src/model'; import { Account } from '../../src/model/account/Account'; import { BlockInfo } from '../../src/model/blockchain/BlockInfo'; import { MerklePathItem } from '../../src/model/blockchain/MerklePathItem'; +import { MerklePosition } from '../../src/model/blockchain/MerklePosition'; import { MerkleProofInfo } from '../../src/model/blockchain/MerkleProofInfo'; +import { PlainMessage } from '../../src/model/message/PlainMessage'; import { NetworkType } from '../../src/model/network/NetworkType'; +import { Transaction } from '../../src/model/transaction/Transaction'; +import { TransferTransaction } from '../../src/model/transaction/TransferTransaction'; import { UInt64 } from '../../src/model/UInt64'; import { BlockService } from '../../src/service/BlockService'; import { TestingAccount } from '../conf/conf.spec'; -import { MerklePosition } from '../../src/model/blockchain/MerklePosition'; -import { TransactionRepository } from '../../src/infrastructure/TransactionRepository'; -import { Page } from '../../src/infrastructure/Page'; -import { Transaction } from '../../src/model/transaction/Transaction'; -import { TransferTransaction } from '../../src/model/transaction/TransferTransaction'; -import { Deadline, TransactionInfo } from '../../src/model'; -import { PlainMessage } from '../../src/model/message/PlainMessage'; -import { TransactionGroup } from '../../src/infrastructure/TransactionGroup'; describe('BlockService', () => { const mockBlockHash = 'D4EC16FCFE696EFDBF1820F68245C88135ACF4C6F888599C8E18BC09B9F08C7B'; diff --git a/test/service/CurrencyService.spec.ts b/test/service/CurrencyService.spec.ts index 0977edb4a5..7b12e62234 100644 --- a/test/service/CurrencyService.spec.ts +++ b/test/service/CurrencyService.spec.ts @@ -23,7 +23,7 @@ import { NamespaceRepository } from '../../src/infrastructure/NamespaceRepositor import { NetworkRepository } from '../../src/infrastructure/NetworkRepository'; import { RepositoryFactory } from '../../src/infrastructure/RepositoryFactory'; import { Account } from '../../src/model/account'; -import { MosaicFlags, MosaicId, MosaicInfo, MosaicNames, Currency } from '../../src/model/mosaic'; +import { Currency, MosaicFlags, MosaicId, MosaicInfo, MosaicNames } from '../../src/model/mosaic'; import { NamespaceId, NamespaceName } from '../../src/model/namespace'; import { NetworkConfiguration } from '../../src/model/network/NetworkConfiguration'; import { NetworkType } from '../../src/model/network/NetworkType'; diff --git a/test/service/MetadataTransactionservice.spec.ts b/test/service/MetadataTransactionservice.spec.ts index ee7d5317b1..e8bf974754 100644 --- a/test/service/MetadataTransactionservice.spec.ts +++ b/test/service/MetadataTransactionservice.spec.ts @@ -19,6 +19,7 @@ import { of as observableOf } from 'rxjs'; import { deepEqual, instance, mock, when } from 'ts-mockito'; import { Convert } from '../../src/core/format/Convert'; import { MetadataRepository } from '../../src/infrastructure/MetadataRepository'; +import { Page } from '../../src/infrastructure/Page'; import { Account } from '../../src/model/account/Account'; import { Metadata } from '../../src/model/metadata/Metadata'; import { MetadataEntry } from '../../src/model/metadata/MetadataEntry'; @@ -34,7 +35,6 @@ import { TransactionType } from '../../src/model/transaction/TransactionType'; import { UInt64 } from '../../src/model/UInt64'; import { MetadataTransactionService } from '../../src/service/MetadataTransactionService'; import { TestingAccount } from '../conf/conf.spec'; -import { Page } from '../../src/infrastructure/Page'; describe('MetadataTransactionService', () => { let account: Account; diff --git a/test/service/MosaicRestrictionTransactionservice.spec.ts b/test/service/MosaicRestrictionTransactionservice.spec.ts index 2c9023b747..0c53c7a4e4 100644 --- a/test/service/MosaicRestrictionTransactionservice.spec.ts +++ b/test/service/MosaicRestrictionTransactionservice.spec.ts @@ -19,6 +19,7 @@ import { of as observableOf } from 'rxjs'; import { deepEqual, instance, mock, when } from 'ts-mockito'; import { KeyGenerator } from '../../src/core/format/KeyGenerator'; import { NamespaceRepository } from '../../src/infrastructure/NamespaceRepository'; +import { Page } from '../../src/infrastructure/Page'; import { RestrictionMosaicRepository } from '../../src/infrastructure/RestrictionMosaicRepository'; import { Account } from '../../src/model/account/Account'; import { MosaicId } from '../../src/model/mosaic/MosaicId'; @@ -36,7 +37,6 @@ import { TransactionType } from '../../src/model/transaction/TransactionType'; import { UInt64 } from '../../src/model/UInt64'; import { MosaicRestrictionTransactionService } from '../../src/service/MosaicRestrictionTransactionService'; import { TestingAccount } from '../conf/conf.spec'; -import { Page } from '../../src/infrastructure/Page'; describe('MosaicRestrictionTransactionService', () => { let account: Account; diff --git a/test/service/MosaicService.spec.ts b/test/service/MosaicService.spec.ts index 8c945ea82f..3d9c7b7cfe 100644 --- a/test/service/MosaicService.spec.ts +++ b/test/service/MosaicService.spec.ts @@ -15,23 +15,23 @@ */ import { expect } from 'chai'; +import { of as observableOf } from 'rxjs'; +import { deepEqual, instance, mock, when } from 'ts-mockito'; +import { AccountRepository } from '../../src/infrastructure/AccountRepository'; +import { MosaicRepository } from '../../src/infrastructure/MosaicRepository'; +import { AccountInfo } from '../../src/model/account/AccountInfo'; +import { AccountType } from '../../src/model/account/AccountType'; +import { PublicAccount } from '../../src/model/account/PublicAccount'; +import { SupplementalPublicKeys } from '../../src/model/account/SupplementalPublicKeys'; import { Mosaic } from '../../src/model/mosaic/Mosaic'; +import { MosaicFlags } from '../../src/model/mosaic/MosaicFlags'; import { MosaicId } from '../../src/model/mosaic/MosaicId'; import { MosaicInfo } from '../../src/model/mosaic/MosaicInfo'; import { UInt64 } from '../../src/model/UInt64'; import { MosaicAmountView } from '../../src/service/MosaicAmountView'; import { MosaicService } from '../../src/service/MosaicService'; import { MosaicView } from '../../src/service/MosaicView'; -import { AccountRepository } from '../../src/infrastructure/AccountRepository'; -import { mock, when, instance, deepEqual } from 'ts-mockito'; -import { MosaicRepository } from '../../src/infrastructure/MosaicRepository'; -import { of as observableOf } from 'rxjs'; -import { PublicAccount } from '../../src/model/account/PublicAccount'; import { TestingAccount } from '../conf/conf.spec'; -import { AccountType } from '../../src/model/account/AccountType'; -import { AccountInfo } from '../../src/model/account/AccountInfo'; -import { MosaicFlags } from '../../src/model/mosaic/MosaicFlags'; -import { SupplementalPublicKeys } from '../../src/model/account/SupplementalPublicKeys'; describe('MosaicService', () => { const accountRepositoryMock = mock(); diff --git a/test/service/NamespaceService.spec.ts b/test/service/NamespaceService.spec.ts index acc5ed9902..7b1465c789 100644 --- a/test/service/NamespaceService.spec.ts +++ b/test/service/NamespaceService.spec.ts @@ -18,6 +18,7 @@ import { expect } from 'chai'; import { of as observableOf } from 'rxjs'; import { deepEqual, instance, mock, when } from 'ts-mockito'; import { NamespaceRepository } from '../../src/infrastructure/NamespaceRepository'; +import { Address } from '../../src/model/account/Address'; import { EmptyAlias } from '../../src/model/namespace/EmptyAlias'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; import { NamespaceInfo } from '../../src/model/namespace/NamespaceInfo'; @@ -25,7 +26,6 @@ import { NamespaceName } from '../../src/model/namespace/NamespaceName'; import { NetworkType } from '../../src/model/network/NetworkType'; import { UInt64 } from '../../src/model/UInt64'; import { NamespaceService } from '../../src/service/NamespaceService'; -import { Address } from '../../src/model/account/Address'; describe('NamespaceService', () => { function givenRootNamespace(): NamespaceInfo { diff --git a/test/service/TransactionService.spec.ts b/test/service/TransactionService.spec.ts index 851d7623a7..e160162e1d 100644 --- a/test/service/TransactionService.spec.ts +++ b/test/service/TransactionService.spec.ts @@ -14,15 +14,14 @@ * limitations under the License. */ -import { expect } from 'chai'; import { ChronoUnit } from '@js-joda/core'; +import { expect } from 'chai'; import { EMPTY, of as observableOf } from 'rxjs'; import { deepEqual, instance, mock, when } from 'ts-mockito'; import { IListener } from '../../src/infrastructure/IListener'; import { ReceiptRepository } from '../../src/infrastructure/ReceiptRepository'; import { TransactionRepository } from '../../src/infrastructure/TransactionRepository'; -import { Account } from '../../src/model/account'; -import { Address } from '../../src/model/account'; +import { Account, Address } from '../../src/model/account'; import { PlainMessage } from '../../src/model/message/PlainMessage'; import { NetworkType } from '../../src/model/network/NetworkType'; import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction';