Renamed accountEntityType to accountOperation

Author: rg911

e2e/infrastructure/TransactionHttp.spec.ts

@@ -38,7 +38,7 @@ import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosai
 import { AliasActionType } from '../../src/model/namespace/AliasActionType';
 import { NamespaceId } from '../../src/model/namespace/NamespaceId';
 import { AccountAddressRestrictionModificationTransaction } from '../../src/model/transaction/AccountAddressRestrictionModificationTransaction';
-import { AccountEntityTypeRestrictionModificationTransaction } from '../../src/model/transaction/AccountEntityTypeRestrictionModificationTransaction';
+import { AccountOperationRestrictionModificationTransaction } from '../../src/model/transaction/AccountOperationRestrictionModificationTransaction';
 import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction';
 import { AccountMosaicRestrictionModificationTransaction } from '../../src/model/transaction/AccountMosaicRestrictionModificationTransaction';
 import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification';
@@ -445,7 +445,7 @@ describe('TransactionHttp', () => {
             );
             const signedTransaction = addressModification.signWith(account3, generationHash);
 
-            listener.confirmed(account3.address).subscribe((transaction: AccountEntityTypeRestrictionModificationTransaction) => {
+            listener.confirmed(account3.address).subscribe((transaction: AccountOperationRestrictionModificationTransaction) => {
                 expect(transaction.modifications, 'Modifications').not.to.be.undefined;
                 expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined;
                 expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined;

src/infrastructure/transaction/CreateTransactionFromDTO.ts

@@ -35,7 +35,7 @@ import { EncryptedMessage } from '../../model/transaction/EncryptedMessage';
 import {LockFundsTransaction} from '../../model/transaction/LockFundsTransaction';
 import { MessageType } from '../../model/transaction/MessageType';
 import {AccountAddressRestrictionModificationTransaction} from '../../model/transaction/AccountAddressRestrictionModificationTransaction';
-import {AccountEntityTypeRestrictionModificationTransaction} from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction';
+import {AccountOperationRestrictionModificationTransaction} from '../../model/transaction/AccountOperationRestrictionModificationTransaction';
 import {AccountMosaicRestrictionModificationTransaction} from '../../model/transaction/AccountMosaicRestrictionModificationTransaction';
 import {ModifyMultisigAccountTransaction} from '../../model/transaction/ModifyMultisigAccountTransaction';
 import {MosaicAliasTransaction} from '../../model/transaction/MosaicAliasTransaction';
@@ -293,7 +293,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
             transactionInfo,
         );
     } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE) {
-        return new AccountEntityTypeRestrictionModificationTransaction(
+        return new AccountOperationRestrictionModificationTransaction(
             extractNetworkType(transactionDTO.version),
             extractTransactionVersion(transactionDTO.version),
             Deadline.createFromDTO(transactionDTO.deadline),

src/infrastructure/transaction/CreateTransactionFromPayload.ts

@@ -37,7 +37,7 @@ import { LockFundsTransaction } from '../../model/transaction/LockFundsTransacti
 import { Message } from '../../model/transaction/Message';
 import { MessageType } from '../../model/transaction/MessageType';
 import { AccountAddressRestrictionModificationTransaction } from '../../model/transaction/AccountAddressRestrictionModificationTransaction';
-import { AccountEntityTypeRestrictionModificationTransaction } from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction';
+import { AccountOperationRestrictionModificationTransaction } from '../../model/transaction/AccountOperationRestrictionModificationTransaction';
 import { AccountMosaicRestrictionModificationTransaction } from '../../model/transaction/AccountMosaicRestrictionModificationTransaction';
 import { ModifyMultisigAccountTransaction } from '../../model/transaction/ModifyMultisigAccountTransaction';
 import { MosaicAliasTransaction } from '../../model/transaction/MosaicAliasTransaction';
@@ -134,7 +134,7 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N
                         networkType,
                     );
                 case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE:
-                    return AccountEntityTypeRestrictionModificationTransaction.create(
+                    return AccountOperationRestrictionModificationTransaction.create(
                         Deadline.createFromDTO(deadline),
                         parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16),
                         modificationArray ? modificationArray.map((modification) => new AccountRestrictionModification(

src/infrastructure/transaction/SerializeTransactionToJSON.ts

@@ -19,7 +19,7 @@ import { AddressAliasTransaction } from '../../model/transaction/AddressAliasTra
 import { AggregateTransaction } from '../../model/transaction/AggregateTransaction';
 import { LockFundsTransaction } from '../../model/transaction/LockFundsTransaction';
 import { AccountAddressRestrictionModificationTransaction } from '../../model/transaction/AccountAddressRestrictionModificationTransaction';
-import { AccountEntityTypeRestrictionModificationTransaction } from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction';
+import { AccountOperationRestrictionModificationTransaction } from '../../model/transaction/AccountOperationRestrictionModificationTransaction';
 import { AccountMosaicRestrictionModificationTransaction } from '../../model/transaction/AccountMosaicRestrictionModificationTransaction';
 import { ModifyMultisigAccountTransaction } from '../../model/transaction/ModifyMultisigAccountTransaction';
 import { MosaicAliasTransaction } from '../../model/transaction/MosaicAliasTransaction';
@@ -78,8 +78,8 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
             };
         case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE:
             return {
-                propertyType: (transaction as AccountEntityTypeRestrictionModificationTransaction).propertyType,
-                modifications: (transaction as AccountEntityTypeRestrictionModificationTransaction).
+                propertyType: (transaction as AccountOperationRestrictionModificationTransaction).propertyType,
+                modifications: (transaction as AccountOperationRestrictionModificationTransaction).
                     modifications.map((modification) => {
                         return modification.toDTO();
                     }),

src/model/model.ts

@@ -93,7 +93,7 @@ export * from './receipt/Statement';
 export * from './transaction/AccountLinkTransaction';
 export * from './transaction/AccountRestrictionTransaction';
 export * from './transaction/AccountAddressRestrictionModificationTransaction';
-export * from './transaction/AccountEntityTypeRestrictionModificationTransaction';
+export * from './transaction/AccountOperationRestrictionModificationTransaction';
 export * from './transaction/AccountMosaicRestrictionModificationTransaction';
 export * from './transaction/AccountRestrictionModification';
 export * from './transaction/AddressAliasTransaction';

src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts renamed to src/model/transaction/AccountOperationRestrictionModificationTransaction.ts

@@ -27,7 +27,7 @@ import { TransactionInfo } from './TransactionInfo';
 import { TransactionType } from './TransactionType';
 import { TransactionVersion } from './TransactionVersion';
 
-export class AccountEntityTypeRestrictionModificationTransaction extends Transaction {
+export class AccountOperationRestrictionModificationTransaction extends Transaction {
 
     /**
      * Create a modify account property entity type transaction object
@@ -36,14 +36,14 @@ export class AccountEntityTypeRestrictionModificationTransaction extends Transac
      * @param modifications - The array of modifications.
      * @param networkType - The network type.
      * @param maxFee - (Optional) Max fee defined by the sender
-     * @returns {AccountEntityTypeRestrictionModificationTransaction}
+     * @returns {AccountOperationRestrictionModificationTransaction}
      */
     public static create(deadline: Deadline,
                          propertyType: PropertyType,
                          modifications: Array<AccountRestrictionModification<TransactionType>>,
                          networkType: NetworkType,
-                         maxFee: UInt64 = new UInt64([0, 0])): AccountEntityTypeRestrictionModificationTransaction {
-        return new AccountEntityTypeRestrictionModificationTransaction(networkType,
+                         maxFee: UInt64 = new UInt64([0, 0])): AccountOperationRestrictionModificationTransaction {
+        return new AccountOperationRestrictionModificationTransaction(networkType,
             TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE,
             deadline,
             maxFee,
@@ -77,9 +77,9 @@ export class AccountEntityTypeRestrictionModificationTransaction extends Transac
 
     /**
      * @override Transaction.size()
-     * @description get the byte size of a AccountEntityTypeRestrictionModificationTransaction
+     * @description get the byte size of a AccountOperationRestrictionModificationTransaction
      * @returns {number}
-     * @memberof AccountEntityTypeRestrictionModificationTransaction
+     * @memberof AccountOperationRestrictionModificationTransaction
      */
     public get size(): number {
         const byteSize = super.size;

src/model/transaction/AccountRestrictionTransaction.ts

@@ -18,8 +18,8 @@ import { PropertyType } from '../account/PropertyType';
 import { NetworkType } from '../blockchain/NetworkType';
 import { UInt64 } from '../UInt64';
 import { AccountAddressRestrictionModificationTransaction } from './AccountAddressRestrictionModificationTransaction';
-import { AccountEntityTypeRestrictionModificationTransaction } from './AccountEntityTypeRestrictionModificationTransaction';
 import { AccountMosaicRestrictionModificationTransaction } from './AccountMosaicRestrictionModificationTransaction';
+import { AccountOperationRestrictionModificationTransaction } from './AccountOperationRestrictionModificationTransaction';
 import { AccountRestrictionModification } from './AccountRestrictionModification';
 import { Deadline } from './Deadline';
 import { TransactionType } from './TransactionType';
@@ -88,19 +88,19 @@ export class AccountRestrictionTransaction {
      * @param modification - array of entity type modifications
      * @param networkType - The network type.
      * @param maxFee - (Optional) Max fee defined by the sender
-     * @returns {AccountEntityTypeRestrictionModificationTransaction}
+     * @returns {AccountOperationRestrictionModificationTransaction}
      */
     public static createEntityTypePropertyModificationTransaction(
         deadline: Deadline,
         propertyType: PropertyType,
         modifications: Array<AccountRestrictionModification<TransactionType>>,
         networkType: NetworkType,
         maxFee: UInt64 = new UInt64([0, 0]),
-    ): AccountEntityTypeRestrictionModificationTransaction {
+    ): AccountOperationRestrictionModificationTransaction {
         if (![PropertyType.AllowTransaction, PropertyType.BlockTransaction].includes(propertyType)) {
             throw new Error ('Property type is not allowed.');
         }
-        return AccountEntityTypeRestrictionModificationTransaction.create(
+        return AccountOperationRestrictionModificationTransaction.create(
             deadline,
             propertyType,
             modifications,

test/model/transaction/AccountPropertyTransaction.spec.ts

@@ -97,7 +97,7 @@ describe('AccountRestrictionTransaction', () => {
             expect(mosaicPropertyTransaction.size).to.be.equal(131);
         });
 
-        it('should return 125 for AccountEntityTypeRestrictionModificationTransaction transaction byte size with 1 modification', () => {
+        it('should return 125 for AccountOperationRestrictionModificationTransaction transaction byte size with 1 modification', () => {
             const entityType = TransactionType.ADDRESS_ALIAS;
             const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType(
                 PropertyModificationType.Add,