symbol · rg911 · Aug 14, 2019 · Aug 6, 2019
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → src/model/namespace/AliasAction.ts b/src/model/namespace/AliasActionType.ts → 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,
 }