From e188a5506f19c009a1c9e0686e80362f9e214c70 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 30 Jan 2020 07:13:25 +0000 Subject: [PATCH 1/2] Fixed lint issues --- e2e/infrastructure/Listener.spec.ts | 2 +- src/core/utils/TransactionMapping.ts | 2 +- src/infrastructure/Listener.ts | 2 +- .../transaction/CreateTransactionFromPayload.ts | 5 +---- .../transaction/AccountAddressRestrictionTransaction.ts | 2 +- src/model/transaction/AccountLinkTransaction.ts | 1 - src/model/transaction/AccountMetadataTransaction.ts | 2 +- .../transaction/AccountMosaicRestrictionTransaction.ts | 2 +- .../transaction/AccountOperationRestrictionTransaction.ts | 2 +- src/model/transaction/AggregateTransaction.ts | 7 +++---- src/model/transaction/LockFundsTransaction.ts | 2 +- .../transaction/MosaicAddressRestrictionTransaction.ts | 2 +- src/model/transaction/MosaicAliasTransaction.ts | 1 - .../transaction/MosaicGlobalRestrictionTransaction.ts | 2 +- src/model/transaction/MosaicMetadataTransaction.ts | 2 +- src/model/transaction/MosaicSupplyChangeTransaction.ts | 2 -- .../transaction/MultisigAccountModificationTransaction.ts | 2 +- src/model/transaction/NamespaceMetadataTransaction.ts | 2 +- src/model/transaction/SecretProofTransaction.ts | 2 +- src/model/transaction/TransferTransaction.ts | 2 +- test/model/transaction/AggregateTransaction.spec.ts | 6 ++---- 21 files changed, 21 insertions(+), 31 deletions(-) diff --git a/e2e/infrastructure/Listener.spec.ts b/e2e/infrastructure/Listener.spec.ts index e42ed2af4f..6359a2771f 100644 --- a/e2e/infrastructure/Listener.spec.ts +++ b/e2e/infrastructure/Listener.spec.ts @@ -22,7 +22,7 @@ import { TransactionRepository } from '../../src/infrastructure/TransactionRepos import { Account } from '../../src/model/account/Account'; import { NetworkType } from '../../src/model/blockchain/NetworkType'; import { PlainMessage } from '../../src/model/message/PlainMessage'; -import { Address, CosignatureTransaction, LockFundsTransaction, Mosaic, SignedTransaction, UInt64, } from '../../src/model/model'; +import { Address, CosignatureTransaction, LockFundsTransaction, Mosaic, SignedTransaction, UInt64 } from '../../src/model/model'; import { MosaicId } from '../../src/model/mosaic/MosaicId'; import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; diff --git a/src/core/utils/TransactionMapping.ts b/src/core/utils/TransactionMapping.ts index 2ff30f570f..0759a7cc36 100644 --- a/src/core/utils/TransactionMapping.ts +++ b/src/core/utils/TransactionMapping.ts @@ -17,7 +17,7 @@ import { CreateTransactionFromDTO } from '../../infrastructure/transaction/CreateTransactionFromDTO'; import { CreateTransactionFromInnerPayload, - CreateTransactionFromPayload + CreateTransactionFromPayload, } from '../../infrastructure/transaction/CreateTransactionFromPayload'; import { Transaction } from '../../model/transaction/Transaction'; diff --git a/src/infrastructure/Listener.ts b/src/infrastructure/Listener.ts index 3cf55f46b6..2453ada310 100644 --- a/src/infrastructure/Listener.ts +++ b/src/infrastructure/Listener.ts @@ -31,7 +31,7 @@ import { TransactionStatusError } from '../model/transaction/TransactionStatusEr import { TransferTransaction } from '../model/transaction/TransferTransaction'; import { UInt64 } from '../model/UInt64'; import { IListener } from './IListener'; -import { CreateTransactionFromDTO, extractBeneficiary, } from './transaction/CreateTransactionFromDTO'; +import { CreateTransactionFromDTO, extractBeneficiary } from './transaction/CreateTransactionFromDTO'; enum ListenerChannelName { block = 'block', diff --git a/src/infrastructure/transaction/CreateTransactionFromPayload.ts b/src/infrastructure/transaction/CreateTransactionFromPayload.ts index 2376c60e09..06f066cc3d 100644 --- a/src/infrastructure/transaction/CreateTransactionFromPayload.ts +++ b/src/infrastructure/transaction/CreateTransactionFromPayload.ts @@ -57,7 +57,7 @@ import { SecretLockTransactionBuilder, SecretProofTransactionBuilder, TransactionHelper, - TransferTransactionBuilder + TransferTransactionBuilder, } from 'catbuffer'; import { Convert, Convert as convert } from '../../core/format'; import { Deadline, PublicAccount, UInt64 } from '../../model/model'; @@ -215,6 +215,3 @@ export const CreateTransactionFromEmbeddedTransactionBuilder = (builder: Embedde return toBuilder().toAggregate(signer); }; - - - diff --git a/src/model/transaction/AccountAddressRestrictionTransaction.ts b/src/model/transaction/AccountAddressRestrictionTransaction.ts index 781c9fc653..bf5d780ae0 100644 --- a/src/model/transaction/AccountAddressRestrictionTransaction.ts +++ b/src/model/transaction/AccountAddressRestrictionTransaction.ts @@ -116,7 +116,7 @@ export class AccountAddressRestrictionTransaction extends Transaction { return UnresolvedMapping.toUnresolvedAddress(Convert.uint8ToHex(deletion.unresolvedAddress)); }), networkType, - maxFee + maxFee, ); } diff --git a/src/model/transaction/AccountLinkTransaction.ts b/src/model/transaction/AccountLinkTransaction.ts index b3730004a1..697b1bb4e3 100644 --- a/src/model/transaction/AccountLinkTransaction.ts +++ b/src/model/transaction/AccountLinkTransaction.ts @@ -89,7 +89,6 @@ export class AccountLinkTransaction extends Transaction { super(TransactionType.ACCOUNT_LINK, networkType, version, deadline, maxFee, signature, signer, transactionInfo); } - /** * Creates a transaction from catbuffer body builders. * @internal diff --git a/src/model/transaction/AccountMetadataTransaction.ts b/src/model/transaction/AccountMetadataTransaction.ts index 3b69c49422..64b772f10d 100644 --- a/src/model/transaction/AccountMetadataTransaction.ts +++ b/src/model/transaction/AccountMetadataTransaction.ts @@ -130,7 +130,7 @@ export class AccountMetadataTransaction extends Transaction { builder.getValueSizeDelta(), Convert.uint8ToUtf8(builder.getValue()), networkType, - maxFee + maxFee, ); } diff --git a/src/model/transaction/AccountMosaicRestrictionTransaction.ts b/src/model/transaction/AccountMosaicRestrictionTransaction.ts index a266d8d274..8bd722003f 100644 --- a/src/model/transaction/AccountMosaicRestrictionTransaction.ts +++ b/src/model/transaction/AccountMosaicRestrictionTransaction.ts @@ -115,7 +115,7 @@ export class AccountMosaicRestrictionTransaction extends Transaction { builder.getRestrictionDeletions().map((deletion) => { return UnresolvedMapping.toUnresolvedMosaic(new UInt64(deletion.unresolvedMosaicId).toHex()); }), - networkType, maxFee + networkType, maxFee, ); } diff --git a/src/model/transaction/AccountOperationRestrictionTransaction.ts b/src/model/transaction/AccountOperationRestrictionTransaction.ts index e270d720df..73c904ce77 100644 --- a/src/model/transaction/AccountOperationRestrictionTransaction.ts +++ b/src/model/transaction/AccountOperationRestrictionTransaction.ts @@ -104,7 +104,7 @@ export class AccountOperationRestrictionTransaction extends Transaction { builder.getRestrictionFlags().valueOf(), builder.getRestrictionAdditions(), builder.getRestrictionDeletions(), - networkType, maxFee + networkType, maxFee, ); } diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 6b763532cd..dc0364f40c 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -159,17 +159,16 @@ export class AggregateTransaction extends Transaction { innerTransactions, networkType, consignatures, - maxFee + maxFee, ) : AggregateTransaction.createBonded( deadline, innerTransactions, networkType, consignatures, - maxFee + maxFee, ); } - /** * @description add inner transactions to current list * @param {Transaction[]} transactions the transactions to be added @@ -386,7 +385,7 @@ export class AggregateTransaction extends Transaction { return DtoMapping.assign(this, { innerTransactions: this.innerTransactions.map((tx) => tx.resolveAliases(statement, transactionInfo.index)) - .sort((a, b) => a.transactionInfo!.index - b.transactionInfo!.index) + .sort((a, b) => a.transactionInfo!.index - b.transactionInfo!.index), }); } } diff --git a/src/model/transaction/LockFundsTransaction.ts b/src/model/transaction/LockFundsTransaction.ts index d7c4b447fb..3d3cebbf2a 100644 --- a/src/model/transaction/LockFundsTransaction.ts +++ b/src/model/transaction/LockFundsTransaction.ts @@ -140,7 +140,7 @@ export class LockFundsTransaction extends Transaction { ), new UInt64(builder.getDuration().blockDuration), new SignedTransaction('', Convert.uint8ToHex(builder.getHash().hash256), '', TransactionType.AGGREGATE_BONDED, networkType), - networkType, maxFee + networkType, maxFee, ); } diff --git a/src/model/transaction/MosaicAddressRestrictionTransaction.ts b/src/model/transaction/MosaicAddressRestrictionTransaction.ts index 400fd45067..391a795189 100644 --- a/src/model/transaction/MosaicAddressRestrictionTransaction.ts +++ b/src/model/transaction/MosaicAddressRestrictionTransaction.ts @@ -150,7 +150,7 @@ export class MosaicAddressRestrictionTransaction extends Transaction { new UInt64(builder.getNewRestrictionValue()), networkType, new UInt64(builder.getPreviousRestrictionValue()), - maxFee + maxFee, ); } diff --git a/src/model/transaction/MosaicAliasTransaction.ts b/src/model/transaction/MosaicAliasTransaction.ts index 768e06b48e..c214bff4ee 100644 --- a/src/model/transaction/MosaicAliasTransaction.ts +++ b/src/model/transaction/MosaicAliasTransaction.ts @@ -100,7 +100,6 @@ export class MosaicAliasTransaction extends Transaction { super(TransactionType.MOSAIC_ALIAS, networkType, version, deadline, maxFee, signature, signer, transactionInfo); } - /** * Creates a transaction from catbuffer body builders. * @internal diff --git a/src/model/transaction/MosaicGlobalRestrictionTransaction.ts b/src/model/transaction/MosaicGlobalRestrictionTransaction.ts index aa38bf7fcd..374be5ad6f 100644 --- a/src/model/transaction/MosaicGlobalRestrictionTransaction.ts +++ b/src/model/transaction/MosaicGlobalRestrictionTransaction.ts @@ -168,7 +168,7 @@ export class MosaicGlobalRestrictionTransaction extends Transaction { builder.getNewRestrictionType().valueOf(), networkType, UnresolvedMapping.toUnresolvedMosaic(new UInt64(builder.getReferenceMosaicId().unresolvedMosaicId).toHex()), - maxFee + maxFee, ); } diff --git a/src/model/transaction/MosaicMetadataTransaction.ts b/src/model/transaction/MosaicMetadataTransaction.ts index b64fa61621..bcac9d371c 100644 --- a/src/model/transaction/MosaicMetadataTransaction.ts +++ b/src/model/transaction/MosaicMetadataTransaction.ts @@ -145,7 +145,7 @@ export class MosaicMetadataTransaction extends Transaction { builder.getValueSizeDelta(), Convert.uint8ToUtf8(builder.getValue()), networkType, - maxFee + maxFee, ); } diff --git a/src/model/transaction/MosaicSupplyChangeTransaction.ts b/src/model/transaction/MosaicSupplyChangeTransaction.ts index 6a0850d22f..1253fdb364 100644 --- a/src/model/transaction/MosaicSupplyChangeTransaction.ts +++ b/src/model/transaction/MosaicSupplyChangeTransaction.ts @@ -106,8 +106,6 @@ export class MosaicSupplyChangeTransaction extends Transaction { super(TransactionType.MOSAIC_SUPPLY_CHANGE, networkType, version, deadline, maxFee, signature, signer, transactionInfo); } - - /** * Creates a transaction from catbuffer body builders. * @internal diff --git a/src/model/transaction/MultisigAccountModificationTransaction.ts b/src/model/transaction/MultisigAccountModificationTransaction.ts index 092c302fa7..f69f3bf458 100644 --- a/src/model/transaction/MultisigAccountModificationTransaction.ts +++ b/src/model/transaction/MultisigAccountModificationTransaction.ts @@ -133,7 +133,7 @@ export class MultisigAccountModificationTransaction extends Transaction { return PublicAccount.createFromPublicKey(Convert.uint8ToHex(deletion.getKey()), networkType); }), networkType, - maxFee + maxFee, ); } diff --git a/src/model/transaction/NamespaceMetadataTransaction.ts b/src/model/transaction/NamespaceMetadataTransaction.ts index b044ca90d6..5f79178a51 100644 --- a/src/model/transaction/NamespaceMetadataTransaction.ts +++ b/src/model/transaction/NamespaceMetadataTransaction.ts @@ -141,7 +141,7 @@ export class NamespaceMetadataTransaction extends Transaction { builder.getValueSizeDelta(), Convert.uint8ToUtf8(builder.getValue()), networkType, - maxFee + maxFee, ); } diff --git a/src/model/transaction/SecretProofTransaction.ts b/src/model/transaction/SecretProofTransaction.ts index 0289e4cd7c..bc6d28f06d 100644 --- a/src/model/transaction/SecretProofTransaction.ts +++ b/src/model/transaction/SecretProofTransaction.ts @@ -125,7 +125,7 @@ export class SecretProofTransaction extends Transaction { UnresolvedMapping.toUnresolvedAddress(Convert.uint8ToHex(builder.getRecipientAddress().unresolvedAddress)), Convert.uint8ToHex(builder.getProof()), networkType, - maxFee + maxFee, ); } diff --git a/src/model/transaction/TransferTransaction.ts b/src/model/transaction/TransferTransaction.ts index a572acf985..3cbf38c5c7 100644 --- a/src/model/transaction/TransferTransaction.ts +++ b/src/model/transaction/TransferTransaction.ts @@ -142,7 +142,7 @@ export class TransferTransaction extends Transaction { messageType === MessageType.PlainMessage ? PlainMessage.createFromPayload(messageHex) : EncryptedMessage.createFromPayload(messageHex), - networkType, maxFee + networkType, maxFee, ); } diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index bb71741e48..ebd8b776a7 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -580,7 +580,7 @@ describe('AggregateTransaction', () => { Deadline.create(), [transferTransaction.toAggregate(account.publicAccount)], networkType, - [] + [], ).setMaxFee(2); ​ expect(aggregateTransaction.maxFee.compact()).to.be.equal(560); @@ -624,7 +624,6 @@ describe('AggregateTransaction', () => { expect(signedTransaction.hash).not.to.be.undefined; }); - it('Test aggregate serialization', () => { const transferTransaction1 = new TransferTransaction( networkType, @@ -653,7 +652,7 @@ describe('AggregateTransaction', () => { new AggregateTransactionCosignature('AAA9366406ACA952B88BADF5F1E9BE6CE4968141035A60BE503273EA65456111AAA9366406ACA952B88BADF5F1E9BE6CE4968141035A60BE503273EA65456111', PublicAccount.createFromPublicKey('9A49366406ACA952B88BADF5F1E9BE6CE4968141035A60BE503273EA65456111', networkType)), new AggregateTransactionCosignature('BBB9366406ACA952B88BADF5F1E9BE6CE4968141035A60BE503273EA65456222BBB9366406ACA952B88BADF5F1E9BE6CE4968141035A60BE503273EA65456222', - PublicAccount.createFromPublicKey('9A49366406ACA952B88BADF5F1E9BE6CE4968141035A60BE503273EA65456111', networkType)) + PublicAccount.createFromPublicKey('9A49366406ACA952B88BADF5F1E9BE6CE4968141035A60BE503273EA65456111', networkType)), ]; const aggregateTransaction = AggregateTransaction.createComplete( @@ -667,7 +666,6 @@ describe('AggregateTransaction', () => { const parsedTransaction = CreateTransactionFromPayload(expected) as AggregateTransaction; - expect(parsedTransaction.deadline.toString()).to.be.equal(aggregateTransaction.deadline.toString()); expect(parsedTransaction.maxFee.toHex()).to.be.equal(aggregateTransaction.maxFee.toHex()); expect(parsedTransaction.cosignatures.length).to.be.equal(2); From fa80cccc2b36dc369f2f2bf6d754ecda0d3edbc8 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 30 Jan 2020 07:16:21 +0000 Subject: [PATCH 2/2] More lint fixes --- e2e/infrastructure/TransactionHttp.spec.ts | 3 ++- src/model/transaction/AccountAddressRestrictionTransaction.ts | 3 ++- src/model/transaction/AccountMosaicRestrictionTransaction.ts | 3 ++- .../transaction/AccountOperationRestrictionTransaction.ts | 3 ++- .../transaction/MultisigAccountModificationTransaction.ts | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/e2e/infrastructure/TransactionHttp.spec.ts b/e2e/infrastructure/TransactionHttp.spec.ts index 49c181ca4c..9b081b9b24 100644 --- a/e2e/infrastructure/TransactionHttp.spec.ts +++ b/e2e/infrastructure/TransactionHttp.spec.ts @@ -134,7 +134,8 @@ describe('TransactionHttp', () => { describe('Get network currency mosaic id', () => { it('get mosaicId', async () => { - networkCurrencyMosaicId = (await namespaceRepository.getLinkedMosaicId(new NamespaceId('cat.currency')).toPromise()) as MosaicId; + networkCurrencyMosaicId = + (await namespaceRepository.getLinkedMosaicId(new NamespaceId('cat.currency')).toPromise()) as MosaicId; }); }); diff --git a/src/model/transaction/AccountAddressRestrictionTransaction.ts b/src/model/transaction/AccountAddressRestrictionTransaction.ts index bf5d780ae0..c7131aaa7b 100644 --- a/src/model/transaction/AccountAddressRestrictionTransaction.ts +++ b/src/model/transaction/AccountAddressRestrictionTransaction.ts @@ -102,7 +102,8 @@ export class AccountAddressRestrictionTransaction extends Transaction { * @param maxFee the preloaded max fee * @returns {Transaction} */ - public static createFromBodyBuilder(builder: AccountAddressRestrictionTransactionBuilder | EmbeddedAccountAddressRestrictionTransactionBuilder, + public static createFromBodyBuilder(builder: AccountAddressRestrictionTransactionBuilder | + EmbeddedAccountAddressRestrictionTransactionBuilder, networkType: NetworkType, deadline: Deadline, maxFee: UInt64): Transaction { diff --git a/src/model/transaction/AccountMosaicRestrictionTransaction.ts b/src/model/transaction/AccountMosaicRestrictionTransaction.ts index 8bd722003f..f59b5015cf 100644 --- a/src/model/transaction/AccountMosaicRestrictionTransaction.ts +++ b/src/model/transaction/AccountMosaicRestrictionTransaction.ts @@ -102,7 +102,8 @@ export class AccountMosaicRestrictionTransaction extends Transaction { * @param maxFee the preloaded max fee * @returns {Transaction} */ - public static createFromBodyBuilder(builder: AccountMosaicRestrictionTransactionBuilder | EmbeddedAccountMosaicRestrictionTransactionBuilder, + public static createFromBodyBuilder(builder: AccountMosaicRestrictionTransactionBuilder | + EmbeddedAccountMosaicRestrictionTransactionBuilder, networkType: NetworkType, deadline: Deadline, maxFee: UInt64): Transaction { diff --git a/src/model/transaction/AccountOperationRestrictionTransaction.ts b/src/model/transaction/AccountOperationRestrictionTransaction.ts index 73c904ce77..8e7464db44 100644 --- a/src/model/transaction/AccountOperationRestrictionTransaction.ts +++ b/src/model/transaction/AccountOperationRestrictionTransaction.ts @@ -96,7 +96,8 @@ export class AccountOperationRestrictionTransaction extends Transaction { * @param maxFee the preloaded max fee * @returns {Transaction} */ - public static createFromBodyBuilder(builder: AccountOperationRestrictionTransactionBuilder | EmbeddedAccountOperationRestrictionTransactionBuilder, + public static createFromBodyBuilder(builder: AccountOperationRestrictionTransactionBuilder | + EmbeddedAccountOperationRestrictionTransactionBuilder, networkType: NetworkType, deadline: Deadline, maxFee: UInt64): Transaction { diff --git a/src/model/transaction/MultisigAccountModificationTransaction.ts b/src/model/transaction/MultisigAccountModificationTransaction.ts index f69f3bf458..c8044bedf8 100644 --- a/src/model/transaction/MultisigAccountModificationTransaction.ts +++ b/src/model/transaction/MultisigAccountModificationTransaction.ts @@ -119,7 +119,8 @@ export class MultisigAccountModificationTransaction extends Transaction { * @param maxFee the preloaded max fee * @returns {Transaction} */ - public static createFromBodyBuilder(builder: MultisigAccountModificationTransactionBuilder | EmbeddedMultisigAccountModificationTransactionBuilder, + public static createFromBodyBuilder(builder: MultisigAccountModificationTransactionBuilder | + EmbeddedMultisigAccountModificationTransactionBuilder, networkType: NetworkType, deadline: Deadline, maxFee: UInt64): Transaction {