Merge 4188bf9 into 9b67cd0

symbol · Nov 7, 2020 · 37731ea · 37731ea
2 parents 9b67cd0 + 4188bf9
commit 37731ea
Show file tree

Hide file tree

Showing 187 changed files with 523 additions and 550 deletions.
diff --git 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
@@ -14,23 +14,22 @@
  * 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';
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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();