From b27ff54832973a3d7dba9b3a509c6c4dc1e2c35f Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Tue, 6 Aug 2019 16:14:19 +0100 Subject: [PATCH] Added #216 model key name updated --- e2e/infrastructure/AccountHttp.spec.ts | 12 +++++----- e2e/infrastructure/MosaicHttp.spec.ts | 6 ++--- e2e/infrastructure/NamespaceHttp.spec.ts | 4 ++-- e2e/infrastructure/TransactionHttp.spec.ts | 14 +++++------ .../CreateTransactionFromDTO.spec.ts | 4 ++-- .../transaction/ValidateTransaction.ts | 2 +- src/infrastructure/Listener.ts | 2 +- .../buffers/AddressAliasTransactionBuffer.ts | 8 +++---- .../buffers/MosaicAliasTransactionBuffer.ts | 8 +++---- .../builders/AddressAliasTransaction.ts | 8 +++---- .../builders/MosaicAliasTransaction.ts | 8 +++---- .../schemas/AddressAliasTransactionSchema.ts | 2 +- .../schemas/MosaicAliasTransactionSchema.ts | 2 +- .../transaction/CreateTransactionFromDTO.ts | 8 +++---- .../transaction/SerializeTransactionToJSON.ts | 6 ++--- src/model/model.ts | 2 +- .../{AliasActionType.ts => AliasAction.ts} | 2 +- .../transaction/AddressAliasTransaction.ts | 14 +++++------ src/model/transaction/AliasTransaction.ts | 6 ++--- .../transaction/MosaicAliasTransaction.ts | 14 +++++------ .../MultisigCosignatoryModification.ts | 6 ++--- src/service/AggregateTransactionService.ts | 2 +- test/core/utils/TransactionMapping.spec.ts | 23 ++++++++++--------- .../SerializeTransactionToJSON.spec.ts | 12 +++++----- .../AddressAliasTransaction.spec.ts | 12 +++++----- .../ModifyMultisigAccountTransaction.spec.ts | 4 ++-- .../MosaicAliasTransaction.spec.ts | 12 +++++----- .../MultisigCosignatoryModification.spec.ts | 9 ++++---- 28 files changed, 106 insertions(+), 106 deletions(-) rename src/model/namespace/{AliasActionType.ts => AliasAction.ts} (96%) diff --git a/e2e/infrastructure/AccountHttp.spec.ts b/e2e/infrastructure/AccountHttp.spec.ts index 89c0ba90ff..d4f5242763 100644 --- a/e2e/infrastructure/AccountHttp.spec.ts +++ b/e2e/infrastructure/AccountHttp.spec.ts @@ -20,12 +20,12 @@ import {AccountHttp} from '../../src/infrastructure/AccountHttp'; import { Listener, TransactionHttp } from '../../src/infrastructure/infrastructure'; import { Account } from '../../src/model/account/Account'; import {Address} from '../../src/model/account/Address'; +import {PublicAccount} from '../../src/model/account/PublicAccount'; import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType'; import { RestrictionType } from '../../src/model/account/RestrictionType'; -import {PublicAccount} from '../../src/model/account/PublicAccount'; import {NetworkType} from '../../src/model/blockchain/NetworkType'; import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic'; -import { AliasActionType } from '../../src/model/namespace/AliasActionType'; +import { AliasAction } from '../../src/model/namespace/AliasAction'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification'; import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction'; @@ -164,7 +164,7 @@ describe('AccountHttp', () => { it('Announce addressAliasTransaction', (done) => { const addressAliasTransaction = AddressAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, account.address, NetworkType.MIJIN_TEST, @@ -293,8 +293,8 @@ describe('AccountHttp', () => { }); }); - describe('getAccountRestrictions', () => { - it('should call getAccountRestrictions successfully', (done) => { + describe('getAccountRestrictionsFromAccounts', () => { + it('should call getAccountRestrictionsFromAccounts successfully', (done) => { setTimeout(() => { accountHttp.getAccountRestrictionsFromAccounts([accountAddress]).subscribe((accountRestrictions) => { deepEqual(accountRestrictions[0]!.accountRestrictions.address, accountAddress); @@ -391,7 +391,7 @@ describe('AccountHttp', () => { it('Announce addressAliasTransaction', (done) => { const addressAliasTransaction = AddressAliasTransaction.create( Deadline.create(), - AliasActionType.Unlink, + AliasAction.Unlink, namespaceId, account.address, NetworkType.MIJIN_TEST, diff --git a/e2e/infrastructure/MosaicHttp.spec.ts b/e2e/infrastructure/MosaicHttp.spec.ts index 8277aae662..761065e4bd 100644 --- a/e2e/infrastructure/MosaicHttp.spec.ts +++ b/e2e/infrastructure/MosaicHttp.spec.ts @@ -21,7 +21,7 @@ import { NetworkType } from '../../src/model/blockchain/NetworkType'; import {MosaicId} from '../../src/model/mosaic/MosaicId'; import { MosaicNonce } from '../../src/model/mosaic/MosaicNonce'; import { MosaicProperties } from '../../src/model/mosaic/MosaicProperties'; -import { AliasActionType } from '../../src/model/namespace/AliasActionType'; +import { AliasAction } from '../../src/model/namespace/AliasAction'; import {NamespaceId} from '../../src/model/namespace/NamespaceId'; import { Deadline } from '../../src/model/transaction/Deadline'; import { MosaicAliasTransaction } from '../../src/model/transaction/MosaicAliasTransaction'; @@ -132,7 +132,7 @@ describe('MosaicHttp', () => { it('Announce MosaicAliasTransaction', (done) => { const mosaicAliasTransaction = MosaicAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, mosaicId, NetworkType.MIJIN_TEST, @@ -222,7 +222,7 @@ describe('MosaicHttp', () => { it('Announce MosaicAliasTransaction', (done) => { const mosaicAliasTransaction = MosaicAliasTransaction.create( Deadline.create(), - AliasActionType.Unlink, + AliasAction.Unlink, namespaceId, mosaicId, NetworkType.MIJIN_TEST, diff --git a/e2e/infrastructure/NamespaceHttp.spec.ts b/e2e/infrastructure/NamespaceHttp.spec.ts index afc63aa4a0..5a33e7dd46 100644 --- a/e2e/infrastructure/NamespaceHttp.spec.ts +++ b/e2e/infrastructure/NamespaceHttp.spec.ts @@ -21,7 +21,7 @@ import { TransactionHttp } from '../../src/infrastructure/TransactionHttp'; import { Account } from '../../src/model/account/Account'; import {NetworkType} from '../../src/model/blockchain/NetworkType'; import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosaic'; -import { AliasActionType } from '../../src/model/namespace/AliasActionType'; +import { AliasAction } from '../../src/model/namespace/AliasAction'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction'; import { Deadline } from '../../src/model/transaction/Deadline'; @@ -94,7 +94,7 @@ describe('NamespaceHttp', () => { it('standalone', (done) => { const addressAliasTransaction = AddressAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, account.address, NetworkType.MIJIN_TEST, diff --git a/e2e/infrastructure/TransactionHttp.spec.ts b/e2e/infrastructure/TransactionHttp.spec.ts index 2f60993e0c..2ad8b0be8d 100644 --- a/e2e/infrastructure/TransactionHttp.spec.ts +++ b/e2e/infrastructure/TransactionHttp.spec.ts @@ -35,7 +35,7 @@ import {MosaicProperties} from '../../src/model/mosaic/MosaicProperties'; import { MosaicRestrictionType } from '../../src/model/mosaic/MosaicRestrictionType'; import {MosaicSupplyType} from '../../src/model/mosaic/MosaicSupplyType'; import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosaic'; -import { AliasActionType } from '../../src/model/namespace/AliasActionType'; +import { AliasAction } from '../../src/model/namespace/AliasAction'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; import { AccountAddressRestrictionModificationTransaction } from '../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction'; @@ -755,7 +755,7 @@ describe('TransactionHttp', () => { it('standalone', (done) => { const addressAliasTransaction = AddressAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, account.address, NetworkType.MIJIN_TEST, @@ -764,7 +764,7 @@ describe('TransactionHttp', () => { listener.confirmed(account.address).subscribe((transaction: AddressAliasTransaction) => { expect(transaction.namespaceId, 'NamespaceId').not.to.be.undefined; - expect(transaction.actionType, 'ActionType').not.to.be.undefined; + expect(transaction.aliasAction, 'AliasAction').not.to.be.undefined; expect(transaction.address, 'Address').not.to.be.undefined; done(); }); @@ -788,7 +788,7 @@ describe('TransactionHttp', () => { it('aggregate', (done) => { const addressAliasTransaction = AddressAliasTransaction.create( Deadline.create(), - AliasActionType.Unlink, + AliasAction.Unlink, namespaceId, account.address, NetworkType.MIJIN_TEST, @@ -890,7 +890,7 @@ describe('TransactionHttp', () => { it('standalone', (done) => { const mosaicAliasTransaction = MosaicAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, mosaicId, NetworkType.MIJIN_TEST, @@ -899,7 +899,7 @@ describe('TransactionHttp', () => { listener.confirmed(account.address).subscribe((transaction: MosaicAliasTransaction) => { expect(transaction.namespaceId, 'NamespaceId').not.to.be.undefined; - expect(transaction.actionType, 'ActionType').not.to.be.undefined; + expect(transaction.aliasAction, 'AliasAction').not.to.be.undefined; expect(transaction.mosaicId, 'MosaicId').not.to.be.undefined; done(); }); @@ -959,7 +959,7 @@ describe('TransactionHttp', () => { it('aggregate', (done) => { const mosaicAliasTransaction = MosaicAliasTransaction.create( Deadline.create(), - AliasActionType.Unlink, + AliasAction.Unlink, namespaceId, mosaicId, NetworkType.MIJIN_TEST, diff --git a/e2e/infrastructure/transaction/CreateTransactionFromDTO.spec.ts b/e2e/infrastructure/transaction/CreateTransactionFromDTO.spec.ts index 5ccda9b9bc..7f9a802332 100644 --- a/e2e/infrastructure/transaction/CreateTransactionFromDTO.spec.ts +++ b/e2e/infrastructure/transaction/CreateTransactionFromDTO.spec.ts @@ -716,7 +716,7 @@ describe('CreateTransactionFromDTO', () => { modifications: [ { cosignatoryPublicKey: '76C1622C7FB58986E500228E8FFB30C606CAAFC1CD78E770E82C73DAB7BD7C9F', - type: 0, + modificiationType: 0, }, ], signature: '553E696EB4A54E43A11D180EBA57E4B89D0048C9DD2604A9E0608120018B9E0' + @@ -783,7 +783,7 @@ describe('CreateTransactionFromDTO', () => { { cosignatoryPublicKey: '589B73FBC22063E9AE6FBAC67CB9C6EA865EF556E5' + 'FB8B7310D45F77C1250B97', - type: 0, + modificiationType: 0, }, ], signer: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF', diff --git a/e2e/infrastructure/transaction/ValidateTransaction.ts b/e2e/infrastructure/transaction/ValidateTransaction.ts index 3a2954acba..4d2640f915 100644 --- a/e2e/infrastructure/transaction/ValidateTransaction.ts +++ b/e2e/infrastructure/transaction/ValidateTransaction.ts @@ -124,7 +124,7 @@ const ValidateTransaction = { .to.be.equal(modifyMultisigAccountTransactionDTO.transaction.minRemovalDelta); deepEqual(modifyMultisigAccountTransaction.modifications[0], new MultisigCosignatoryModification( - modifyMultisigAccountTransactionDTO.transaction.modifications[0].type, + modifyMultisigAccountTransactionDTO.transaction.modifications[0].modificiationType, PublicAccount.createFromPublicKey(modifyMultisigAccountTransactionDTO.transaction.modifications[0].cosignatoryPublicKey, NetworkType.MIJIN_TEST), ), diff --git a/src/infrastructure/Listener.ts b/src/infrastructure/Listener.ts index a4055e4329..fb631222f5 100644 --- a/src/infrastructure/Listener.ts +++ b/src/infrastructure/Listener.ts @@ -409,7 +409,7 @@ export class Listener { private accountAddedToMultiSig(transaction: Transaction, address: Address): boolean { if (transaction instanceof ModifyMultisigAccountTransaction) { transaction.modifications.map((_: MultisigCosignatoryModification) => { - if (_.type === MultisigCosignatoryModificationType.Add && _.cosignatoryPublicAccount.address.equals(address)) { + if (_.modificiationType === MultisigCosignatoryModificationType.Add && _.cosignatoryPublicAccount.address.equals(address)) { return true; } }); diff --git a/src/infrastructure/buffers/AddressAliasTransactionBuffer.ts b/src/infrastructure/buffers/AddressAliasTransactionBuffer.ts index 48dd845503..00aa5f0a78 100644 --- a/src/infrastructure/buffers/AddressAliasTransactionBuffer.ts +++ b/src/infrastructure/buffers/AddressAliasTransactionBuffer.ts @@ -190,7 +190,7 @@ Catapult.Buffers.AddressAliasTransactionBuffer.prototype.deadlineArray = functio /** * @returns {number} */ -Catapult.Buffers.AddressAliasTransactionBuffer.prototype.actionType = function() { +Catapult.Buffers.AddressAliasTransactionBuffer.prototype.aliasAction = function() { var offset = this.bb.__offset(this.bb_pos, 18); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; @@ -394,10 +394,10 @@ Catapult.Buffers.AddressAliasTransactionBuffer.startDeadlineVector = function(bu /** * @param {flatbuffers.Builder} builder - * @param {number} actionType + * @param {number} aliasAction */ -Catapult.Buffers.AddressAliasTransactionBuffer.addActionType = function(builder, actionType) { - builder.addFieldInt8(7, actionType, 0); +Catapult.Buffers.AddressAliasTransactionBuffer.addAliasAction = function(builder, aliasAction) { + builder.addFieldInt8(7, aliasAction, 0); }; /** diff --git a/src/infrastructure/buffers/MosaicAliasTransactionBuffer.ts b/src/infrastructure/buffers/MosaicAliasTransactionBuffer.ts index ee4d523f8d..3632f14354 100644 --- a/src/infrastructure/buffers/MosaicAliasTransactionBuffer.ts +++ b/src/infrastructure/buffers/MosaicAliasTransactionBuffer.ts @@ -190,7 +190,7 @@ Catapult.Buffers.MosaicAliasTransactionBuffer.prototype.deadlineArray = function /** * @returns {number} */ -Catapult.Buffers.MosaicAliasTransactionBuffer.prototype.actionType = function() { +Catapult.Buffers.MosaicAliasTransactionBuffer.prototype.aliasAction = function() { var offset = this.bb.__offset(this.bb_pos, 18); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; @@ -394,10 +394,10 @@ Catapult.Buffers.MosaicAliasTransactionBuffer.startDeadlineVector = function(bui /** * @param {flatbuffers.Builder} builder - * @param {number} actionType + * @param {number} aliasAction */ -Catapult.Buffers.MosaicAliasTransactionBuffer.addActionType = function(builder, actionType) { - builder.addFieldInt8(7, actionType, 0); +Catapult.Buffers.MosaicAliasTransactionBuffer.addAliasAction = function(builder, aliasAction) { + builder.addFieldInt8(7, aliasAction, 0); }; /** diff --git a/src/infrastructure/builders/AddressAliasTransaction.ts b/src/infrastructure/builders/AddressAliasTransaction.ts index fa5aefba1c..bbbda06fb9 100644 --- a/src/infrastructure/builders/AddressAliasTransaction.ts +++ b/src/infrastructure/builders/AddressAliasTransaction.ts @@ -41,7 +41,7 @@ export class Builder { deadline: any; address: any; namespaceId: any; - actionType: any; + aliasAction: any; constructor() { this.maxFee = [0, 0]; this.type = TransactionType.ADDRESS_ALIAS; @@ -67,8 +67,8 @@ export class Builder { return this; } - addActionType(actionType) { - this.actionType = actionType; + addAliasAction(aliasAction) { + this.aliasAction = aliasAction; return this; } @@ -107,7 +107,7 @@ export class Builder { AddressAliasTransactionBuffer.addType(builder, this.type); AddressAliasTransactionBuffer.addFee(builder, feeVector); AddressAliasTransactionBuffer.addDeadline(builder, deadlineVector); - AddressAliasTransactionBuffer.addActionType(builder, this.actionType); + AddressAliasTransactionBuffer.addAliasAction(builder, this.aliasAction); AddressAliasTransactionBuffer.addNamespaceId(builder, namespaceIdVector); AddressAliasTransactionBuffer.addAddress(builder, addressVector); diff --git a/src/infrastructure/builders/MosaicAliasTransaction.ts b/src/infrastructure/builders/MosaicAliasTransaction.ts index 8d96078f09..7d3abcb45d 100644 --- a/src/infrastructure/builders/MosaicAliasTransaction.ts +++ b/src/infrastructure/builders/MosaicAliasTransaction.ts @@ -40,7 +40,7 @@ export class Builder { type: any; deadline: any; mosaicId: any; - actionType: any; + aliasAction: any; namespaceId: any; constructor() { this.maxFee = [0, 0]; @@ -67,8 +67,8 @@ export class Builder { return this; } - addActionType(actionType) { - this.actionType = actionType; + addAliasAction(aliasAction) { + this.aliasAction = aliasAction; return this; } @@ -107,7 +107,7 @@ export class Builder { MosaicAliasTransactionBuffer.addType(builder, this.type); MosaicAliasTransactionBuffer.addFee(builder, feeVector); MosaicAliasTransactionBuffer.addDeadline(builder, deadlineVector); - MosaicAliasTransactionBuffer.addActionType(builder, this.actionType); + MosaicAliasTransactionBuffer.addAliasAction(builder, this.aliasAction); MosaicAliasTransactionBuffer.addNamespaceId(builder, namespaceIdVector); MosaicAliasTransactionBuffer.addMosaicId(builder, mosaicIdVector); diff --git a/src/infrastructure/schemas/AddressAliasTransactionSchema.ts b/src/infrastructure/schemas/AddressAliasTransactionSchema.ts index 4a9ceb4d25..ef01e3eadd 100644 --- a/src/infrastructure/schemas/AddressAliasTransactionSchema.ts +++ b/src/infrastructure/schemas/AddressAliasTransactionSchema.ts @@ -38,7 +38,7 @@ export default new Schema([ ushort('type'), array('fee', TypeSize.INT), array('deadline', TypeSize.INT), - ubyte('actionType'), + ubyte('aliasAction'), array('namespaceId', TypeSize.INT), array('address', TypeSize.BYTE) ]); diff --git a/src/infrastructure/schemas/MosaicAliasTransactionSchema.ts b/src/infrastructure/schemas/MosaicAliasTransactionSchema.ts index b8a69b4c3e..37b827b192 100644 --- a/src/infrastructure/schemas/MosaicAliasTransactionSchema.ts +++ b/src/infrastructure/schemas/MosaicAliasTransactionSchema.ts @@ -38,7 +38,7 @@ export default new Schema([ ushort('type'), array('fee', TypeSize.INT), array('deadline', TypeSize.INT), - ubyte('actionType'), + ubyte('aliasAction'), array('namespaceId', TypeSize.INT), array('mosaicId', TypeSize.INT) ]); diff --git a/src/infrastructure/transaction/CreateTransactionFromDTO.ts b/src/infrastructure/transaction/CreateTransactionFromDTO.ts index 65abcd1df5..2205ed1d37 100644 --- a/src/infrastructure/transaction/CreateTransactionFromDTO.ts +++ b/src/infrastructure/transaction/CreateTransactionFromDTO.ts @@ -195,7 +195,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr transactionDTO.minApprovalDelta, transactionDTO.minRemovalDelta, transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new MultisigCosignatoryModification( - modificationDTO.type, + modificationDTO.modificiationType, PublicAccount.createFromPublicKey(modificationDTO.cosignatoryPublicKey, extractNetworkType(transactionDTO.version)), )) : [], transactionDTO.signature, @@ -258,7 +258,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), - transactionDTO.action, + transactionDTO.aliasAction, new NamespaceId(transactionDTO.namespaceId), new MosaicId(transactionDTO.mosaicId), transactionDTO.signature, @@ -272,7 +272,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), - transactionDTO.action, + transactionDTO.aliasAction, new NamespaceId(transactionDTO.namespaceId), extractRecipient(transactionDTO.address) as Address, transactionDTO.signature, @@ -335,7 +335,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), transactionDTO.remoteAccountKey, - transactionDTO.action, + transactionDTO.linkAction, transactionDTO.signature, transactionDTO.signer ? PublicAccount.createFromPublicKey(transactionDTO.signer, extractNetworkType(transactionDTO.version)) : undefined, diff --git a/src/infrastructure/transaction/SerializeTransactionToJSON.ts b/src/infrastructure/transaction/SerializeTransactionToJSON.ts index a9c5c838e0..4802bbd278 100644 --- a/src/infrastructure/transaction/SerializeTransactionToJSON.ts +++ b/src/infrastructure/transaction/SerializeTransactionToJSON.ts @@ -45,11 +45,11 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { case TransactionType.LINK_ACCOUNT: return { remoteAccountKey: (transaction as AccountLinkTransaction).remoteAccountKey, - action: (transaction as AccountLinkTransaction).linkAction, + linkAction: (transaction as AccountLinkTransaction).linkAction, }; case TransactionType.ADDRESS_ALIAS: return { - action: (transaction as AddressAliasTransaction).actionType, + aliasAction: (transaction as AddressAliasTransaction).aliasAction, namespaceId: (transaction as AddressAliasTransaction).namespaceId.toDTO(), address: (transaction as AddressAliasTransaction).address.toDTO(), }; @@ -103,7 +103,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { }; case TransactionType.MOSAIC_ALIAS: return { - action: (transaction as MosaicAliasTransaction).actionType, + aliasAction: (transaction as MosaicAliasTransaction).aliasAction, namespaceId: (transaction as MosaicAliasTransaction).namespaceId.toDTO(), mosaicId: (transaction as MosaicAliasTransaction).mosaicId.toDTO(), }; diff --git a/src/model/model.ts b/src/model/model.ts index 62bb27f331..ec948eca39 100644 --- a/src/model/model.ts +++ b/src/model/model.ts @@ -67,7 +67,7 @@ export * from './namespace/NamespaceId'; export * from './namespace/NamespaceInfo'; export * from './namespace/NamespaceName'; export * from './namespace/NamespaceType'; -export * from './namespace/AliasActionType'; +export * from './namespace/AliasAction'; // Node export * from './node/NodeInfo'; diff --git a/src/model/namespace/AliasActionType.ts b/src/model/namespace/AliasAction.ts similarity index 96% rename from src/model/namespace/AliasActionType.ts rename to src/model/namespace/AliasAction.ts index e44895f689..ae709efd97 100644 --- a/src/model/namespace/AliasActionType.ts +++ b/src/model/namespace/AliasAction.ts @@ -19,7 +19,7 @@ * 0: Link an alias. * 1: Unlink an alias. */ -export enum AliasActionType { +export enum AliasAction { Link = 0, Unlink = 1, } diff --git a/src/model/transaction/AddressAliasTransaction.ts b/src/model/transaction/AddressAliasTransaction.ts index a0ac7d269f..c52a9efbed 100644 --- a/src/model/transaction/AddressAliasTransaction.ts +++ b/src/model/transaction/AddressAliasTransaction.ts @@ -19,7 +19,7 @@ import { VerifiableTransaction } from '../../infrastructure/builders/VerifiableT import { Address } from '../account/Address'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; -import { AliasActionType } from '../namespace/AliasActionType'; +import { AliasAction } from '../namespace/AliasAction'; import { NamespaceId } from '../namespace/NamespaceId'; import { UInt64 } from '../UInt64'; import { Deadline } from './Deadline'; @@ -37,7 +37,7 @@ export class AddressAliasTransaction extends Transaction { /** * Create a address alias transaction object * @param deadline - The deadline to include the transaction. - * @param actionType - The alias action type. + * @param aliasAction - The alias action type. * @param namespaceId - The namespace id. * @param address - The address. * @param networkType - The network type. @@ -45,7 +45,7 @@ export class AddressAliasTransaction extends Transaction { * @returns {AddressAliasTransaction} */ public static create(deadline: Deadline, - actionType: AliasActionType, + aliasAction: AliasAction, namespaceId: NamespaceId, address: Address, networkType: NetworkType, @@ -54,7 +54,7 @@ export class AddressAliasTransaction extends Transaction { TransactionVersion.ADDRESS_ALIAS, deadline, maxFee, - actionType, + aliasAction, namespaceId, address, ); @@ -65,7 +65,7 @@ export class AddressAliasTransaction extends Transaction { * @param version * @param deadline * @param maxFee - * @param actionType + * @param aliasAction * @param namespaceId * @param address * @param signature @@ -79,7 +79,7 @@ export class AddressAliasTransaction extends Transaction { /** * The alias action type. */ - public readonly actionType: AliasActionType, + public readonly aliasAction: AliasAction, /** * The namespace id that will be an alias. */ @@ -120,7 +120,7 @@ export class AddressAliasTransaction extends Transaction { .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addActionType(this.actionType) + .addAliasAction(this.aliasAction) .addNamespaceId(this.namespaceId.id.toDTO()) .addAddress(this.address.plain()) .build(); diff --git a/src/model/transaction/AliasTransaction.ts b/src/model/transaction/AliasTransaction.ts index 2333bd04be..4b023a0575 100644 --- a/src/model/transaction/AliasTransaction.ts +++ b/src/model/transaction/AliasTransaction.ts @@ -17,7 +17,7 @@ import { Address } from '../account/Address'; import { NetworkType } from '../blockchain/NetworkType'; import { MosaicId } from '../mosaic/MosaicId'; -import { AliasActionType } from '../namespace/AliasActionType'; +import { AliasAction } from '../namespace/AliasAction'; import { NamespaceId } from '../namespace/NamespaceId'; import { UInt64 } from '../UInt64'; import { AddressAliasTransaction } from './AddressAliasTransaction'; @@ -38,7 +38,7 @@ export abstract class AliasTransaction extends Transaction { * @returns {AddressAliasTransaction} */ public static createForAddress(deadline: Deadline, - aliasAction: AliasActionType, + aliasAction: AliasAction, namespaceId: NamespaceId, address: Address, networkType: NetworkType, @@ -64,7 +64,7 @@ export abstract class AliasTransaction extends Transaction { * @returns {MosaicAliasTransaction} */ public static createForMosaic(deadline: Deadline, - aliasAction: AliasActionType, + aliasAction: AliasAction, namespaceId: NamespaceId, mosaicId: MosaicId, networkType: NetworkType, diff --git a/src/model/transaction/MosaicAliasTransaction.ts b/src/model/transaction/MosaicAliasTransaction.ts index 8cc1d1914a..8220ccea1e 100644 --- a/src/model/transaction/MosaicAliasTransaction.ts +++ b/src/model/transaction/MosaicAliasTransaction.ts @@ -19,7 +19,7 @@ import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTra import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { MosaicId } from '../mosaic/MosaicId'; -import { AliasActionType } from '../namespace/AliasActionType'; +import { AliasAction } from '../namespace/AliasAction'; import { NamespaceId } from '../namespace/NamespaceId'; import { UInt64 } from '../UInt64'; import { Deadline } from './Deadline'; @@ -33,7 +33,7 @@ export class MosaicAliasTransaction extends Transaction { /** * Create a mosaic alias transaction object * @param deadline - The deadline to include the transaction. - * @param actionType - The alias action type. + * @param aliasAction - The alias action type. * @param namespaceId - The namespace id. * @param mosaicId - The mosaic id. * @param networkType - The network type. @@ -41,7 +41,7 @@ export class MosaicAliasTransaction extends Transaction { * @returns {MosaicAliasTransaction} */ public static create(deadline: Deadline, - actionType: AliasActionType, + aliasAction: AliasAction, namespaceId: NamespaceId, mosaicId: MosaicId, networkType: NetworkType, @@ -50,7 +50,7 @@ export class MosaicAliasTransaction extends Transaction { TransactionVersion.MOSAIC_ALIAS, deadline, maxFee, - actionType, + aliasAction, namespaceId, mosaicId, ); @@ -61,7 +61,7 @@ export class MosaicAliasTransaction extends Transaction { * @param version * @param deadline * @param maxFee - * @param actionType + * @param aliasAction * @param namespaceId * @param mosaicId * @param signature @@ -75,7 +75,7 @@ export class MosaicAliasTransaction extends Transaction { /** * The alias action type. */ - public readonly actionType: AliasActionType, + public readonly aliasAction: AliasAction, /** * The namespace id that will be an alias. */ @@ -116,7 +116,7 @@ export class MosaicAliasTransaction extends Transaction { .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addActionType(this.actionType) + .addAliasAction(this.aliasAction) .addNamespaceId(this.namespaceId.id.toDTO()) .addMosaicId(this.mosaicId.id.toDTO()) .build(); diff --git a/src/model/transaction/MultisigCosignatoryModification.ts b/src/model/transaction/MultisigCosignatoryModification.ts index 5e1192097c..e0d45b99d5 100644 --- a/src/model/transaction/MultisigCosignatoryModification.ts +++ b/src/model/transaction/MultisigCosignatoryModification.ts @@ -27,14 +27,14 @@ export class MultisigCosignatoryModification { /** * Constructor - * @param type + * @param modificiationType * @param cosignatoryPublicAccount */ constructor( /** * Multi-signature modification type. */ - public readonly type: MultisigCosignatoryModificationType, + public readonly modificiationType: MultisigCosignatoryModificationType, /** * Cosignatory public account. */ @@ -48,7 +48,7 @@ export class MultisigCosignatoryModification { toDTO() { return { cosignatoryPublicKey: this.cosignatoryPublicAccount.publicKey, - type: this.type, + modificiationType: this.modificiationType, }; } } diff --git a/src/service/AggregateTransactionService.ts b/src/service/AggregateTransactionService.ts index cd7bb44381..98775221ce 100644 --- a/src/service/AggregateTransactionService.ts +++ b/src/service/AggregateTransactionService.ts @@ -99,7 +99,7 @@ export class AggregateTransactionService { */ if (innerTransaction.type === TransactionType.MODIFY_MULTISIG_ACCOUNT) { if ((innerTransaction as ModifyMultisigAccountTransaction).modifications - .find((modification) => modification.type === MultisigCosignatoryModificationType.Remove) !== undefined) { + .find((modification) => modification.modificiationType === MultisigCosignatoryModificationType.Remove) !== undefined) { isMultisigRemoval = true; } } diff --git a/test/core/utils/TransactionMapping.spec.ts b/test/core/utils/TransactionMapping.spec.ts index 98fb4f5c86..b3653114f1 100644 --- a/test/core/utils/TransactionMapping.spec.ts +++ b/test/core/utils/TransactionMapping.spec.ts @@ -32,7 +32,7 @@ import { MosaicProperties } from '../../../src/model/mosaic/MosaicProperties'; import { MosaicRestrictionType } from '../../../src/model/mosaic/MosaicRestrictionType'; import { MosaicSupplyType } from '../../../src/model/mosaic/MosaicSupplyType'; import { NetworkCurrencyMosaic } from '../../../src/model/mosaic/NetworkCurrencyMosaic'; -import { AliasActionType } from '../../../src/model/namespace/AliasActionType'; +import { AliasAction } from '../../../src/model/namespace/AliasAction'; import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; import { NamespaceType } from '../../../src/model/namespace/NamespaceType'; import { AccountAddressRestrictionModificationTransaction } from '../../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; @@ -132,7 +132,8 @@ describe('TransactionMapping - createFromPayload', () => { const signedTransaction = operationRestrictionTransaction.signWith(account, generationHash); - const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; + const transaction = TransactionMapping + .createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowTransaction); expect(transaction.modifications[0].value).to.be.equal(operation); expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); @@ -143,7 +144,7 @@ describe('TransactionMapping - createFromPayload', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressAliasTransaction = AddressAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, address, NetworkType.MIJIN_TEST, @@ -153,7 +154,7 @@ describe('TransactionMapping - createFromPayload', () => { const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AddressAliasTransaction; - expect(transaction.actionType).to.be.equal(AliasActionType.Link); + expect(transaction.aliasAction).to.be.equal(AliasAction.Link); expect(transaction.namespaceId.id.lower).to.be.equal(33347626); expect(transaction.namespaceId.id.higher).to.be.equal(3779697293); expect(transaction.address.plain()).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); @@ -164,7 +165,7 @@ describe('TransactionMapping - createFromPayload', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicAliasTransaction = MosaicAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, mosaicId, NetworkType.MIJIN_TEST, @@ -173,7 +174,7 @@ describe('TransactionMapping - createFromPayload', () => { const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as MosaicAliasTransaction; - expect(mosaicAliasTransaction.actionType).to.be.equal(AliasActionType.Link); + expect(mosaicAliasTransaction.aliasAction).to.be.equal(AliasAction.Link); expect(mosaicAliasTransaction.namespaceId.id.lower).to.be.equal(33347626); expect(mosaicAliasTransaction.namespaceId.id.higher).to.be.equal(3779697293); expect(mosaicAliasTransaction.mosaicId.id.lower).to.be.equal(2262289484); @@ -414,7 +415,7 @@ describe('TransactionMapping - createFromPayload', () => { .to.be.equal(2); expect(transaction.minRemovalDelta) .to.be.equal(1); - expect(transaction.modifications[0].type) + expect(transaction.modifications[0].modificiationType) .to.be.equal(MultisigCosignatoryModificationType.Add); expect(transaction.modifications[0].cosignatoryPublicAccount.publicKey) .to.be.equal('B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24'); @@ -725,7 +726,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressAliasTransaction = AddressAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, address, NetworkType.MIJIN_TEST, @@ -735,7 +736,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => TransactionMapping.createFromDTO(addressAliasTransaction.toJSON()) as AddressAliasTransaction; expect(transaction.type).to.be.equal(TransactionType.ADDRESS_ALIAS); - expect(transaction.actionType).to.be.equal(AliasActionType.Link); + expect(transaction.aliasAction).to.be.equal(AliasAction.Link); }); it('should create MosaicAliasTransaction', () => { @@ -743,7 +744,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicAliasTransaction = MosaicAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, mosaicId, NetworkType.MIJIN_TEST, @@ -752,7 +753,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => TransactionMapping.createFromDTO(mosaicAliasTransaction.toJSON()) as MosaicAliasTransaction; expect(transaction.type).to.be.equal(TransactionType.MOSAIC_ALIAS); - expect(transaction.actionType).to.be.equal(AliasActionType.Link); + expect(transaction.aliasAction).to.be.equal(AliasAction.Link); }); diff --git a/test/infrastructure/SerializeTransactionToJSON.spec.ts b/test/infrastructure/SerializeTransactionToJSON.spec.ts index 5a13ee0d28..2f3ce56962 100644 --- a/test/infrastructure/SerializeTransactionToJSON.spec.ts +++ b/test/infrastructure/SerializeTransactionToJSON.spec.ts @@ -28,7 +28,7 @@ import { MosaicNonce } from '../../src/model/mosaic/MosaicNonce'; import { MosaicProperties } from '../../src/model/mosaic/MosaicProperties'; import { MosaicSupplyType } from '../../src/model/mosaic/MosaicSupplyType'; import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic'; -import { AliasActionType } from '../../src/model/namespace/AliasActionType'; +import { AliasAction } from '../../src/model/namespace/AliasAction'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction'; import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification'; @@ -72,7 +72,7 @@ describe('SerializeTransactionToJSON', () => { const json = accountLinkTransaction.toJSON(); expect(json.transaction.remoteAccountKey).to.be.equal(account.publicKey); - expect(json.transaction.action).to.be.equal(LinkAction.Link); + expect(json.transaction.linkAction).to.be.equal(LinkAction.Link); }); it('should create AccountRestrictionAddressTransaction', () => { @@ -140,7 +140,7 @@ describe('SerializeTransactionToJSON', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressAliasTransaction = AddressAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, address, NetworkType.MIJIN_TEST, @@ -149,7 +149,7 @@ describe('SerializeTransactionToJSON', () => { const json = addressAliasTransaction.toJSON(); expect(json.transaction.type).to.be.equal(TransactionType.ADDRESS_ALIAS); - expect(json.transaction.action).to.be.equal(AliasActionType.Link); + expect(json.transaction.aliasAction).to.be.equal(AliasAction.Link); }); it('should create MosaicAliasTransaction', () => { @@ -157,7 +157,7 @@ describe('SerializeTransactionToJSON', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicAliasTransaction = MosaicAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, mosaicId, NetworkType.MIJIN_TEST, @@ -165,7 +165,7 @@ describe('SerializeTransactionToJSON', () => { const json = mosaicAliasTransaction.toJSON(); expect(json.transaction.type).to.be.equal(TransactionType.MOSAIC_ALIAS); - expect(json.transaction.action).to.be.equal(AliasActionType.Link); + expect(json.transaction.aliasAction).to.be.equal(AliasAction.Link); }); diff --git a/test/model/transaction/AddressAliasTransaction.spec.ts b/test/model/transaction/AddressAliasTransaction.spec.ts index b05aa01f04..3111de06cb 100644 --- a/test/model/transaction/AddressAliasTransaction.spec.ts +++ b/test/model/transaction/AddressAliasTransaction.spec.ts @@ -19,7 +19,7 @@ import {Account} from '../../../src/model/account/Account'; import {Address} from '../../../src/model/account/Address'; import {NetworkType} from '../../../src/model/blockchain/NetworkType'; import {MosaicId} from '../../../src/model/mosaic/MosaicId'; -import {AliasActionType} from '../../../src/model/namespace/AliasActionType'; +import {AliasAction} from '../../../src/model/namespace/AliasAction'; import {NamespaceId} from '../../../src/model/namespace/NamespaceId'; import {AddressAliasTransaction} from '../../../src/model/transaction/AddressAliasTransaction'; import {Deadline} from '../../../src/model/transaction/Deadline'; @@ -38,7 +38,7 @@ describe('AddressAliasTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressAliasTransaction = AddressAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, address, NetworkType.MIJIN_TEST, @@ -53,7 +53,7 @@ describe('AddressAliasTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressAliasTransaction = AddressAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, address, NetworkType.MIJIN_TEST, @@ -69,13 +69,13 @@ describe('AddressAliasTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressAliasTransaction = AddressAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, address, NetworkType.MIJIN_TEST, ); - expect(addressAliasTransaction.actionType).to.be.equal(AliasActionType.Link); + expect(addressAliasTransaction.aliasAction).to.be.equal(AliasAction.Link); expect(addressAliasTransaction.namespaceId.id.lower).to.be.equal(33347626); expect(addressAliasTransaction.namespaceId.id.higher).to.be.equal(3779697293); expect(addressAliasTransaction.address.plain()).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); @@ -95,7 +95,7 @@ describe('AddressAliasTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressAliasTransaction = AddressAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, address, NetworkType.MIJIN_TEST, diff --git a/test/model/transaction/ModifyMultisigAccountTransaction.spec.ts b/test/model/transaction/ModifyMultisigAccountTransaction.spec.ts index 503f196c8d..f6065c02b3 100644 --- a/test/model/transaction/ModifyMultisigAccountTransaction.spec.ts +++ b/test/model/transaction/ModifyMultisigAccountTransaction.spec.ts @@ -101,11 +101,11 @@ describe('ModifyMultisigAccountTransaction', () => { .to.be.equal(1); expect(modifyMultisigAccountTransaction.modifications.length) .to.be.equal(2); - expect(modifyMultisigAccountTransaction.modifications[0].type) + expect(modifyMultisigAccountTransaction.modifications[0].modificiationType) .to.be.equal(MultisigCosignatoryModificationType.Add); expect(modifyMultisigAccountTransaction.modifications[0].cosignatoryPublicAccount.publicKey) .to.be.equal('B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24'); - expect(modifyMultisigAccountTransaction.modifications[1].type) + expect(modifyMultisigAccountTransaction.modifications[1].modificiationType) .to.be.equal(MultisigCosignatoryModificationType.Add); expect(modifyMultisigAccountTransaction.modifications[1].cosignatoryPublicAccount.publicKey) .to.be.equal('B1B5581FC81A6970DEE418D2C2978F2724228B7B36C5C6DF71B0162BB04778B4'); diff --git a/test/model/transaction/MosaicAliasTransaction.spec.ts b/test/model/transaction/MosaicAliasTransaction.spec.ts index 82a26c9ed8..0cf1077609 100644 --- a/test/model/transaction/MosaicAliasTransaction.spec.ts +++ b/test/model/transaction/MosaicAliasTransaction.spec.ts @@ -18,7 +18,7 @@ import {expect} from 'chai'; import {Account} from '../../../src/model/account/Account'; import {NetworkType} from '../../../src/model/blockchain/NetworkType'; import {MosaicId} from '../../../src/model/mosaic/MosaicId'; -import {AliasActionType} from '../../../src/model/namespace/AliasActionType'; +import {AliasAction} from '../../../src/model/namespace/AliasAction'; import {NamespaceId} from '../../../src/model/namespace/NamespaceId'; import {Deadline} from '../../../src/model/transaction/Deadline'; import {MosaicAliasTransaction} from '../../../src/model/transaction/MosaicAliasTransaction'; @@ -37,7 +37,7 @@ describe('MosaicAliasTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicAliasTransaction = MosaicAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, mosaicId, NetworkType.MIJIN_TEST, @@ -52,7 +52,7 @@ describe('MosaicAliasTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicAliasTransaction = MosaicAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, mosaicId, NetworkType.MIJIN_TEST, @@ -68,13 +68,13 @@ describe('MosaicAliasTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicAliasTransaction = MosaicAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, mosaicId, NetworkType.MIJIN_TEST, ); - expect(mosaicAliasTransaction.actionType).to.be.equal(AliasActionType.Link); + expect(mosaicAliasTransaction.aliasAction).to.be.equal(AliasAction.Link); expect(mosaicAliasTransaction.namespaceId.id.lower).to.be.equal(33347626); expect(mosaicAliasTransaction.namespaceId.id.higher).to.be.equal(3779697293); expect(mosaicAliasTransaction.mosaicId.id.lower).to.be.equal(2262289484); @@ -95,7 +95,7 @@ describe('MosaicAliasTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicAliasTransaction = MosaicAliasTransaction.create( Deadline.create(), - AliasActionType.Link, + AliasAction.Link, namespaceId, mosaicId, NetworkType.MIJIN_TEST, diff --git a/test/model/transaction/MultisigCosignatoryModification.spec.ts b/test/model/transaction/MultisigCosignatoryModification.spec.ts index 61356ec9d0..5c03c03bc3 100644 --- a/test/model/transaction/MultisigCosignatoryModification.spec.ts +++ b/test/model/transaction/MultisigCosignatoryModification.spec.ts @@ -29,7 +29,7 @@ describe('MultisigCosignatoryModification', () => { ); expect(multisigCosignatoryModification.cosignatoryPublicAccount.publicKey) .to.be.equal('C52C211CF935C61D65F26B253AA260416F018C3D21E4D184A7671F403C849BBB'); - expect(multisigCosignatoryModification.type).to.be.equal(MultisigCosignatoryModificationType.Add); + expect(multisigCosignatoryModification.modificiationType).to.be.equal(MultisigCosignatoryModificationType.Add); }); it('should create Add MultisigCosignatoryModification and get toDTO correctly', () => { @@ -39,10 +39,9 @@ describe('MultisigCosignatoryModification', () => { ).toDTO(); expect(multisigCosignatoryModification.cosignatoryPublicKey) .to.be.equal('C52C211CF935C61D65F26B253AA260416F018C3D21E4D184A7671F403C849BBB'); - expect(multisigCosignatoryModification.type).to.be.equal(MultisigCosignatoryModificationType.Add); + expect(multisigCosignatoryModification.modificiationType).to.be.equal(MultisigCosignatoryModificationType.Add); }); - it('should create Remove MultisigCosignatoryModification', () => { const multisigCosignatoryModification = new MultisigCosignatoryModification( MultisigCosignatoryModificationType.Remove, @@ -50,7 +49,7 @@ describe('MultisigCosignatoryModification', () => { ); expect(multisigCosignatoryModification.cosignatoryPublicAccount.publicKey) .to.be.equal('C52C211CF935C61D65F26B253AA260416F018C3D21E4D184A7671F403C849BBB'); - expect(multisigCosignatoryModification.type).to.be.equal(MultisigCosignatoryModificationType.Remove); + expect(multisigCosignatoryModification.modificiationType).to.be.equal(MultisigCosignatoryModificationType.Remove); }); it('should create Remove MultisigCosignatoryModification and get toDTO correctly', () => { @@ -60,6 +59,6 @@ describe('MultisigCosignatoryModification', () => { ).toDTO(); expect(multisigCosignatoryModification.cosignatoryPublicKey) .to.be.equal('C52C211CF935C61D65F26B253AA260416F018C3D21E4D184A7671F403C849BBB'); - expect(multisigCosignatoryModification.type).to.be.equal(MultisigCosignatoryModificationType.Remove); + expect(multisigCosignatoryModification.modificiationType).to.be.equal(MultisigCosignatoryModificationType.Remove); }); });