Skip to content

Commit 7b91ea5

Browse files
rg911rg911
authored
Merge pull request #224 from rg911/task/g216_field_name_changed
Model field name updates
2 parents 71e41cd + b27ff54 commit 7b91ea5

28 files changed

+106
-106
lines changed

‎e2e/infrastructure/AccountHttp.spec.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import {AccountHttp} from '../../src/infrastructure/AccountHttp';
2020
import { Listener, TransactionHttp } from '../../src/infrastructure/infrastructure';
2121
import { Account } from '../../src/model/account/Account';
2222
import {Address} from '../../src/model/account/Address';
23+
import {PublicAccount} from '../../src/model/account/PublicAccount';
2324
import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType';
2425
import { RestrictionType } from '../../src/model/account/RestrictionType';
25-
import {PublicAccount} from '../../src/model/account/PublicAccount';
2626
import {NetworkType} from '../../src/model/blockchain/NetworkType';
2727
import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic';
28-
import { AliasActionType } from '../../src/model/namespace/AliasActionType';
28+
import { AliasAction } from '../../src/model/namespace/AliasAction';
2929
import { NamespaceId } from '../../src/model/namespace/NamespaceId';
3030
import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification';
3131
import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction';
@@ -164,7 +164,7 @@ describe('AccountHttp', () => {
164164
it('Announce addressAliasTransaction', (done) => {
165165
const addressAliasTransaction = AddressAliasTransaction.create(
166166
Deadline.create(),
167-
AliasActionType.Link,
167+
AliasAction.Link,
168168
namespaceId,
169169
account.address,
170170
NetworkType.MIJIN_TEST,
@@ -293,8 +293,8 @@ describe('AccountHttp', () => {
293293
});
294294
});
295295

296-
describe('getAccountRestrictions', () => {
297-
it('should call getAccountRestrictions successfully', (done) => {
296+
describe('getAccountRestrictionsFromAccounts', () => {
297+
it('should call getAccountRestrictionsFromAccounts successfully', (done) => {
298298
setTimeout(() => {
299299
accountHttp.getAccountRestrictionsFromAccounts([accountAddress]).subscribe((accountRestrictions) => {
300300
deepEqual(accountRestrictions[0]!.accountRestrictions.address, accountAddress);
@@ -391,7 +391,7 @@ describe('AccountHttp', () => {
391391
it('Announce addressAliasTransaction', (done) => {
392392
const addressAliasTransaction = AddressAliasTransaction.create(
393393
Deadline.create(),
394-
AliasActionType.Unlink,
394+
AliasAction.Unlink,
395395
namespaceId,
396396
account.address,
397397
NetworkType.MIJIN_TEST,

‎e2e/infrastructure/MosaicHttp.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { NetworkType } from '../../src/model/blockchain/NetworkType';
2121
import {MosaicId} from '../../src/model/mosaic/MosaicId';
2222
import { MosaicNonce } from '../../src/model/mosaic/MosaicNonce';
2323
import { MosaicProperties } from '../../src/model/mosaic/MosaicProperties';
24-
import { AliasActionType } from '../../src/model/namespace/AliasActionType';
24+
import { AliasAction } from '../../src/model/namespace/AliasAction';
2525
import {NamespaceId} from '../../src/model/namespace/NamespaceId';
2626
import { Deadline } from '../../src/model/transaction/Deadline';
2727
import { MosaicAliasTransaction } from '../../src/model/transaction/MosaicAliasTransaction';
@@ -132,7 +132,7 @@ describe('MosaicHttp', () => {
132132
it('Announce MosaicAliasTransaction', (done) => {
133133
const mosaicAliasTransaction = MosaicAliasTransaction.create(
134134
Deadline.create(),
135-
AliasActionType.Link,
135+
AliasAction.Link,
136136
namespaceId,
137137
mosaicId,
138138
NetworkType.MIJIN_TEST,
@@ -222,7 +222,7 @@ describe('MosaicHttp', () => {
222222
it('Announce MosaicAliasTransaction', (done) => {
223223
const mosaicAliasTransaction = MosaicAliasTransaction.create(
224224
Deadline.create(),
225-
AliasActionType.Unlink,
225+
AliasAction.Unlink,
226226
namespaceId,
227227
mosaicId,
228228
NetworkType.MIJIN_TEST,

‎e2e/infrastructure/NamespaceHttp.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { TransactionHttp } from '../../src/infrastructure/TransactionHttp';
2121
import { Account } from '../../src/model/account/Account';
2222
import {NetworkType} from '../../src/model/blockchain/NetworkType';
2323
import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosaic';
24-
import { AliasActionType } from '../../src/model/namespace/AliasActionType';
24+
import { AliasAction } from '../../src/model/namespace/AliasAction';
2525
import { NamespaceId } from '../../src/model/namespace/NamespaceId';
2626
import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction';
2727
import { Deadline } from '../../src/model/transaction/Deadline';
@@ -94,7 +94,7 @@ describe('NamespaceHttp', () => {
9494
it('standalone', (done) => {
9595
const addressAliasTransaction = AddressAliasTransaction.create(
9696
Deadline.create(),
97-
AliasActionType.Link,
97+
AliasAction.Link,
9898
namespaceId,
9999
account.address,
100100
NetworkType.MIJIN_TEST,

‎e2e/infrastructure/TransactionHttp.spec.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import {MosaicProperties} from '../../src/model/mosaic/MosaicProperties';
3535
import { MosaicRestrictionType } from '../../src/model/mosaic/MosaicRestrictionType';
3636
import {MosaicSupplyType} from '../../src/model/mosaic/MosaicSupplyType';
3737
import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosaic';
38-
import { AliasActionType } from '../../src/model/namespace/AliasActionType';
38+
import { AliasAction } from '../../src/model/namespace/AliasAction';
3939
import { NamespaceId } from '../../src/model/namespace/NamespaceId';
4040
import { AccountAddressRestrictionModificationTransaction } from '../../src/model/transaction/AccountAddressRestrictionModificationTransaction';
4141
import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction';
@@ -755,7 +755,7 @@ describe('TransactionHttp', () => {
755755
it('standalone', (done) => {
756756
const addressAliasTransaction = AddressAliasTransaction.create(
757757
Deadline.create(),
758-
AliasActionType.Link,
758+
AliasAction.Link,
759759
namespaceId,
760760
account.address,
761761
NetworkType.MIJIN_TEST,
@@ -764,7 +764,7 @@ describe('TransactionHttp', () => {
764764

765765
listener.confirmed(account.address).subscribe((transaction: AddressAliasTransaction) => {
766766
expect(transaction.namespaceId, 'NamespaceId').not.to.be.undefined;
767-
expect(transaction.actionType, 'ActionType').not.to.be.undefined;
767+
expect(transaction.aliasAction, 'AliasAction').not.to.be.undefined;
768768
expect(transaction.address, 'Address').not.to.be.undefined;
769769
done();
770770
});
@@ -788,7 +788,7 @@ describe('TransactionHttp', () => {
788788
it('aggregate', (done) => {
789789
const addressAliasTransaction = AddressAliasTransaction.create(
790790
Deadline.create(),
791-
AliasActionType.Unlink,
791+
AliasAction.Unlink,
792792
namespaceId,
793793
account.address,
794794
NetworkType.MIJIN_TEST,
@@ -890,7 +890,7 @@ describe('TransactionHttp', () => {
890890
it('standalone', (done) => {
891891
const mosaicAliasTransaction = MosaicAliasTransaction.create(
892892
Deadline.create(),
893-
AliasActionType.Link,
893+
AliasAction.Link,
894894
namespaceId,
895895
mosaicId,
896896
NetworkType.MIJIN_TEST,
@@ -899,7 +899,7 @@ describe('TransactionHttp', () => {
899899

900900
listener.confirmed(account.address).subscribe((transaction: MosaicAliasTransaction) => {
901901
expect(transaction.namespaceId, 'NamespaceId').not.to.be.undefined;
902-
expect(transaction.actionType, 'ActionType').not.to.be.undefined;
902+
expect(transaction.aliasAction, 'AliasAction').not.to.be.undefined;
903903
expect(transaction.mosaicId, 'MosaicId').not.to.be.undefined;
904904
done();
905905
});
@@ -959,7 +959,7 @@ describe('TransactionHttp', () => {
959959
it('aggregate', (done) => {
960960
const mosaicAliasTransaction = MosaicAliasTransaction.create(
961961
Deadline.create(),
962-
AliasActionType.Unlink,
962+
AliasAction.Unlink,
963963
namespaceId,
964964
mosaicId,
965965
NetworkType.MIJIN_TEST,

‎e2e/infrastructure/transaction/CreateTransactionFromDTO.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ describe('CreateTransactionFromDTO', () => {
716716
modifications: [
717717
{
718718
cosignatoryPublicKey: '76C1622C7FB58986E500228E8FFB30C606CAAFC1CD78E770E82C73DAB7BD7C9F',
719-
type: 0,
719+
modificiationType: 0,
720720
},
721721
],
722722
signature: '553E696EB4A54E43A11D180EBA57E4B89D0048C9DD2604A9E0608120018B9E0' +
@@ -783,7 +783,7 @@ describe('CreateTransactionFromDTO', () => {
783783
{
784784
cosignatoryPublicKey: '589B73FBC22063E9AE6FBAC67CB9C6EA865EF556E5' +
785785
'FB8B7310D45F77C1250B97',
786-
type: 0,
786+
modificiationType: 0,
787787
},
788788
],
789789
signer: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',

‎e2e/infrastructure/transaction/ValidateTransaction.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ const ValidateTransaction = {
124124
.to.be.equal(modifyMultisigAccountTransactionDTO.transaction.minRemovalDelta);
125125

126126
deepEqual(modifyMultisigAccountTransaction.modifications[0], new MultisigCosignatoryModification(
127-
modifyMultisigAccountTransactionDTO.transaction.modifications[0].type,
127+
modifyMultisigAccountTransactionDTO.transaction.modifications[0].modificiationType,
128128
PublicAccount.createFromPublicKey(modifyMultisigAccountTransactionDTO.transaction.modifications[0].cosignatoryPublicKey,
129129
NetworkType.MIJIN_TEST),
130130
),

‎src/infrastructure/Listener.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ export class Listener {
409409
private accountAddedToMultiSig(transaction: Transaction, address: Address): boolean {
410410
if (transaction instanceof ModifyMultisigAccountTransaction) {
411411
transaction.modifications.map((_: MultisigCosignatoryModification) => {
412-
if (_.type === MultisigCosignatoryModificationType.Add && _.cosignatoryPublicAccount.address.equals(address)) {
412+
if (_.modificiationType === MultisigCosignatoryModificationType.Add && _.cosignatoryPublicAccount.address.equals(address)) {
413413
return true;
414414
}
415415
});

‎src/infrastructure/buffers/AddressAliasTransactionBuffer.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ Catapult.Buffers.AddressAliasTransactionBuffer.prototype.deadlineArray = functio
190190
/**
191191
* @returns {number}
192192
*/
193-
Catapult.Buffers.AddressAliasTransactionBuffer.prototype.actionType = function() {
193+
Catapult.Buffers.AddressAliasTransactionBuffer.prototype.aliasAction = function() {
194194
var offset = this.bb.__offset(this.bb_pos, 18);
195195
return offset ? this.bb.readUint8(this.bb_pos + offset) : 0;
196196
};
@@ -394,10 +394,10 @@ Catapult.Buffers.AddressAliasTransactionBuffer.startDeadlineVector = function(bu
394394

395395
/**
396396
* @param {flatbuffers.Builder} builder
397-
* @param {number} actionType
397+
* @param {number} aliasAction
398398
*/
399-
Catapult.Buffers.AddressAliasTransactionBuffer.addActionType = function(builder, actionType) {
400-
builder.addFieldInt8(7, actionType, 0);
399+
Catapult.Buffers.AddressAliasTransactionBuffer.addAliasAction = function(builder, aliasAction) {
400+
builder.addFieldInt8(7, aliasAction, 0);
401401
};
402402

403403
/**

‎src/infrastructure/buffers/MosaicAliasTransactionBuffer.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ Catapult.Buffers.MosaicAliasTransactionBuffer.prototype.deadlineArray = function
190190
/**
191191
* @returns {number}
192192
*/
193-
Catapult.Buffers.MosaicAliasTransactionBuffer.prototype.actionType = function() {
193+
Catapult.Buffers.MosaicAliasTransactionBuffer.prototype.aliasAction = function() {
194194
var offset = this.bb.__offset(this.bb_pos, 18);
195195
return offset ? this.bb.readUint8(this.bb_pos + offset) : 0;
196196
};
@@ -394,10 +394,10 @@ Catapult.Buffers.MosaicAliasTransactionBuffer.startDeadlineVector = function(bui
394394

395395
/**
396396
* @param {flatbuffers.Builder} builder
397-
* @param {number} actionType
397+
* @param {number} aliasAction
398398
*/
399-
Catapult.Buffers.MosaicAliasTransactionBuffer.addActionType = function(builder, actionType) {
400-
builder.addFieldInt8(7, actionType, 0);
399+
Catapult.Buffers.MosaicAliasTransactionBuffer.addAliasAction = function(builder, aliasAction) {
400+
builder.addFieldInt8(7, aliasAction, 0);
401401
};
402402

403403
/**

‎src/infrastructure/builders/AddressAliasTransaction.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export class Builder {
4141
deadline: any;
4242
address: any;
4343
namespaceId: any;
44-
actionType: any;
44+
aliasAction: any;
4545
constructor() {
4646
this.maxFee = [0, 0];
4747
this.type = TransactionType.ADDRESS_ALIAS;
@@ -67,8 +67,8 @@ export class Builder {
6767
return this;
6868
}
6969

70-
addActionType(actionType) {
71-
this.actionType = actionType;
70+
addAliasAction(aliasAction) {
71+
this.aliasAction = aliasAction;
7272
return this;
7373
}
7474

@@ -107,7 +107,7 @@ export class Builder {
107107
AddressAliasTransactionBuffer.addType(builder, this.type);
108108
AddressAliasTransactionBuffer.addFee(builder, feeVector);
109109
AddressAliasTransactionBuffer.addDeadline(builder, deadlineVector);
110-
AddressAliasTransactionBuffer.addActionType(builder, this.actionType);
110+
AddressAliasTransactionBuffer.addAliasAction(builder, this.aliasAction);
111111
AddressAliasTransactionBuffer.addNamespaceId(builder, namespaceIdVector);
112112
AddressAliasTransactionBuffer.addAddress(builder, addressVector);
113113

0 commit comments

Comments
 (0)