Skip to content

Commit 98f57d5

Browse files
rg911rg911
committed
Added #192 Updated AccountPropertyTransaction Names
1 parent ed28463 commit 98f57d5

14 files changed

+184
-184
lines changed

‎e2e/infrastructure/AccountHttp.spec.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import {NetworkType} from '../../src/model/blockchain/NetworkType';
2727
import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic';
2828
import { AliasActionType } from '../../src/model/namespace/AliasActionType';
2929
import { NamespaceId } from '../../src/model/namespace/NamespaceId';
30-
import { AccountPropertyModification } from '../../src/model/transaction/AccountPropertyModification';
31-
import { AccountPropertyTransaction } from '../../src/model/transaction/AccountPropertyTransaction';
30+
import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification';
31+
import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction';
3232
import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction';
3333
import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction';
3434
import { Deadline } from '../../src/model/transaction/Deadline';
@@ -193,12 +193,12 @@ describe('AccountHttp', () => {
193193
return listener.close();
194194
});
195195

196-
it('Announce AccountPropertyTransaction', (done) => {
197-
const addressPropertyFilter = AccountPropertyModification.createForAddress(
196+
it('Announce AccountRestrictionTransaction', (done) => {
197+
const addressPropertyFilter = AccountRestrictionModification.createForAddress(
198198
PropertyModificationType.Add,
199199
account3.address,
200200
);
201-
const addressModification = AccountPropertyTransaction.createAddressPropertyModificationTransaction(
201+
const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction(
202202
Deadline.create(),
203203
PropertyType.BlockAddress,
204204
[addressPropertyFilter],
@@ -419,12 +419,12 @@ describe('AccountHttp', () => {
419419
return listener.close();
420420
});
421421

422-
it('Announce AccountPropertyTransaction', (done) => {
423-
const addressPropertyFilter = AccountPropertyModification.createForAddress(
422+
it('Announce AccountRestrictionTransaction', (done) => {
423+
const addressPropertyFilter = AccountRestrictionModification.createForAddress(
424424
PropertyModificationType.Remove,
425425
account3.address,
426426
);
427-
const addressModification = AccountPropertyTransaction.createAddressPropertyModificationTransaction(
427+
const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction(
428428
Deadline.create(),
429429
PropertyType.BlockAddress,
430430
[addressPropertyFilter],

‎e2e/infrastructure/TransactionHttp.spec.ts‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,12 @@ import {MosaicSupplyType} from '../../src/model/mosaic/MosaicSupplyType';
3737
import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosaic';
3838
import { AliasActionType } from '../../src/model/namespace/AliasActionType';
3939
import { NamespaceId } from '../../src/model/namespace/NamespaceId';
40+
import { AccountAddressRestrictionModificationTransaction } from '../../src/model/transaction/AccountAddressRestrictionModificationTransaction';
41+
import { AccountEntityTypeRestrictionModificationTransaction } from '../../src/model/transaction/AccountEntityTypeRestrictionModificationTransaction';
4042
import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction';
41-
import { AccountPropertyModification } from '../../src/model/transaction/AccountPropertyModification';
42-
import { AccountPropertyTransaction } from '../../src/model/transaction/AccountPropertyTransaction';
43+
import { AccountMosaicRestrictionModificationTransaction } from '../../src/model/transaction/AccountMosaicRestrictionModificationTransaction';
44+
import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification';
45+
import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction';
4346
import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction';
4447
import {AggregateTransaction} from '../../src/model/transaction/AggregateTransaction';
4548
import {CosignatureSignedTransaction} from '../../src/model/transaction/CosignatureSignedTransaction';
@@ -49,9 +52,6 @@ import { HashLockTransaction } from '../../src/model/transaction/HashLockTransac
4952
import {HashType} from '../../src/model/transaction/HashType';
5053
import { LinkAction } from '../../src/model/transaction/LinkAction';
5154
import {LockFundsTransaction} from '../../src/model/transaction/LockFundsTransaction';
52-
import { ModifyAccountPropertyAddressTransaction } from '../../src/model/transaction/ModifyAccountPropertyAddressTransaction';
53-
import { ModifyAccountPropertyEntityTypeTransaction } from '../../src/model/transaction/ModifyAccountPropertyEntityTypeTransaction';
54-
import { ModifyAccountPropertyMosaicTransaction } from '../../src/model/transaction/ModifyAccountPropertyMosaicTransaction';
5555
import {ModifyMultisigAccountTransaction} from '../../src/model/transaction/ModifyMultisigAccountTransaction';
5656
import { MosaicAliasTransaction } from '../../src/model/transaction/MosaicAliasTransaction';
5757
import {MosaicDefinitionTransaction} from '../../src/model/transaction/MosaicDefinitionTransaction';
@@ -272,7 +272,7 @@ describe('TransactionHttp', () => {
272272
transactionHttp.announce(signedTransaction);
273273
});
274274
});
275-
describe('AccountPropertyTransaction - Address', () => {
275+
describe('AccountRestrictionTransaction - Address', () => {
276276
let listener: Listener;
277277
before (() => {
278278
listener = new Listener(config.apiUrl);
@@ -283,19 +283,19 @@ describe('TransactionHttp', () => {
283283
});
284284

285285
it('standalone', (done) => {
286-
const addressPropertyFilter = AccountPropertyModification.createForAddress(
286+
const addressPropertyFilter = AccountRestrictionModification.createForAddress(
287287
PropertyModificationType.Add,
288288
account3.address,
289289
);
290-
const addressModification = AccountPropertyTransaction.createAddressPropertyModificationTransaction(
290+
const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction(
291291
Deadline.create(),
292292
PropertyType.BlockAddress,
293293
[addressPropertyFilter],
294294
NetworkType.MIJIN_TEST,
295295
);
296296
const signedTransaction = addressModification.signWith(account, generationHash);
297297

298-
listener.confirmed(account.address).subscribe((transaction: ModifyAccountPropertyAddressTransaction) => {
298+
listener.confirmed(account.address).subscribe((transaction: AccountAddressRestrictionModificationTransaction) => {
299299
expect(transaction.modifications, 'Modifications').not.to.be.undefined;
300300
expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined;
301301
expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined;
@@ -310,7 +310,7 @@ describe('TransactionHttp', () => {
310310
transactionHttp.announce(signedTransaction);
311311
});
312312
});
313-
describe('AccountPropertyTransaction - Address', () => {
313+
describe('AccountRestrictionTransaction - Address', () => {
314314
let listener: Listener;
315315
before (() => {
316316
listener = new Listener(config.apiUrl);
@@ -320,11 +320,11 @@ describe('TransactionHttp', () => {
320320
return listener.close();
321321
});
322322
it('aggregate', (done) => {
323-
const addressPropertyFilter = AccountPropertyModification.createForAddress(
323+
const addressPropertyFilter = AccountRestrictionModification.createForAddress(
324324
PropertyModificationType.Remove,
325325
account3.address,
326326
);
327-
const addressModification = AccountPropertyTransaction.createAddressPropertyModificationTransaction(
327+
const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction(
328328
Deadline.create(),
329329
PropertyType.BlockAddress,
330330
[addressPropertyFilter],
@@ -347,7 +347,7 @@ describe('TransactionHttp', () => {
347347
transactionHttp.announce(signedTransaction);
348348
});
349349
});
350-
describe('AccountPropertyTransaction - Mosaic', () => {
350+
describe('AccountRestrictionTransaction - Mosaic', () => {
351351
let listener: Listener;
352352
before (() => {
353353
listener = new Listener(config.apiUrl);
@@ -358,19 +358,19 @@ describe('TransactionHttp', () => {
358358
});
359359

360360
it('standalone', (done) => {
361-
const mosaicPropertyFilter = AccountPropertyModification.createForMosaic(
361+
const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic(
362362
PropertyModificationType.Add,
363363
mosaicId,
364364
);
365-
const addressModification = AccountPropertyTransaction.createMosaicPropertyModificationTransaction(
365+
const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction(
366366
Deadline.create(),
367367
PropertyType.BlockMosaic,
368368
[mosaicPropertyFilter],
369369
NetworkType.MIJIN_TEST,
370370
);
371371
const signedTransaction = addressModification.signWith(account, generationHash);
372372

373-
listener.confirmed(account.address).subscribe((transaction: ModifyAccountPropertyMosaicTransaction) => {
373+
listener.confirmed(account.address).subscribe((transaction: AccountMosaicRestrictionModificationTransaction) => {
374374
expect(transaction.modifications, 'Modifications').not.to.be.undefined;
375375
expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined;
376376
expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined;
@@ -385,7 +385,7 @@ describe('TransactionHttp', () => {
385385
transactionHttp.announce(signedTransaction);
386386
});
387387
});
388-
describe('AccountPropertyTransaction - Mosaic', () => {
388+
describe('AccountRestrictionTransaction - Mosaic', () => {
389389
let listener: Listener;
390390
before (() => {
391391
listener = new Listener(config.apiUrl);
@@ -395,11 +395,11 @@ describe('TransactionHttp', () => {
395395
return listener.close();
396396
});
397397
it('aggregate', (done) => {
398-
const mosaicPropertyFilter = AccountPropertyModification.createForMosaic(
398+
const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic(
399399
PropertyModificationType.Remove,
400400
mosaicId,
401401
);
402-
const addressModification = AccountPropertyTransaction.createMosaicPropertyModificationTransaction(
402+
const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction(
403403
Deadline.create(),
404404
PropertyType.BlockMosaic,
405405
[mosaicPropertyFilter],
@@ -422,7 +422,7 @@ describe('TransactionHttp', () => {
422422
transactionHttp.announce(signedTransaction);
423423
});
424424
});
425-
describe('AccountPropertyTransaction - EntityType', () => {
425+
describe('AccountRestrictionTransaction - EntityType', () => {
426426
let listener: Listener;
427427
before (() => {
428428
listener = new Listener(config.apiUrl);
@@ -433,19 +433,19 @@ describe('TransactionHttp', () => {
433433
});
434434

435435
it('standalone', (done) => {
436-
const entityTypePropertyFilter = AccountPropertyModification.createForEntityType(
436+
const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType(
437437
PropertyModificationType.Add,
438438
TransactionType.LINK_ACCOUNT,
439439
);
440-
const addressModification = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction(
440+
const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction(
441441
Deadline.create(),
442442
PropertyType.BlockTransaction,
443443
[entityTypePropertyFilter],
444444
NetworkType.MIJIN_TEST,
445445
);
446446
const signedTransaction = addressModification.signWith(account3, generationHash);
447447

448-
listener.confirmed(account3.address).subscribe((transaction: ModifyAccountPropertyEntityTypeTransaction) => {
448+
listener.confirmed(account3.address).subscribe((transaction: AccountEntityTypeRestrictionModificationTransaction) => {
449449
expect(transaction.modifications, 'Modifications').not.to.be.undefined;
450450
expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined;
451451
expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined;
@@ -460,7 +460,7 @@ describe('TransactionHttp', () => {
460460
transactionHttp.announce(signedTransaction);
461461
});
462462
});
463-
describe('AccountPropertyTransaction - EntityType', () => {
463+
describe('AccountRestrictionTransaction - EntityType', () => {
464464
let listener: Listener;
465465
before (() => {
466466
listener = new Listener(config.apiUrl);
@@ -470,11 +470,11 @@ describe('TransactionHttp', () => {
470470
return listener.close();
471471
});
472472
it('aggregate', (done) => {
473-
const entityTypePropertyFilter = AccountPropertyModification.createForEntityType(
473+
const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType(
474474
PropertyModificationType.Remove,
475475
TransactionType.LINK_ACCOUNT,
476476
);
477-
const addressModification = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction(
477+
const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction(
478478
Deadline.create(),
479479
PropertyType.BlockTransaction,
480480
[entityTypePropertyFilter],

‎src/infrastructure/transaction/CreateTransactionFromDTO.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {MosaicProperties} from '../../model/mosaic/MosaicProperties';
2525
import { MosaicPropertyType } from '../../model/mosaic/MosaicPropertyType';
2626
import {NamespaceId} from '../../model/namespace/NamespaceId';
2727
import { AccountLinkTransaction } from '../../model/transaction/AccountLinkTransaction';
28-
import {AccountPropertyModification} from '../../model/transaction/AccountPropertyModification';
28+
import {AccountRestrictionModification} from '../../model/transaction/AccountRestrictionModification';
2929
import {AddressAliasTransaction} from '../../model/transaction/AddressAliasTransaction';
3030
import {AggregateTransaction} from '../../model/transaction/AggregateTransaction';
3131
import {AggregateTransactionCosignature} from '../../model/transaction/AggregateTransactionCosignature';
@@ -34,9 +34,9 @@ import {Deadline} from '../../model/transaction/Deadline';
3434
import { EncryptedMessage } from '../../model/transaction/EncryptedMessage';
3535
import {LockFundsTransaction} from '../../model/transaction/LockFundsTransaction';
3636
import { MessageType } from '../../model/transaction/MessageType';
37-
import {ModifyAccountPropertyAddressTransaction} from '../../model/transaction/ModifyAccountPropertyAddressTransaction';
38-
import {ModifyAccountPropertyEntityTypeTransaction} from '../../model/transaction/ModifyAccountPropertyEntityTypeTransaction';
39-
import {ModifyAccountPropertyMosaicTransaction} from '../../model/transaction/ModifyAccountPropertyMosaicTransaction';
37+
import {AccountAddressRestrictionModificationTransaction} from '../../model/transaction/AccountAddressRestrictionModificationTransaction';
38+
import {AccountEntityTypeRestrictionModificationTransaction} from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction';
39+
import {AccountMosaicRestrictionModificationTransaction} from '../../model/transaction/AccountMosaicRestrictionModificationTransaction';
4040
import {ModifyMultisigAccountTransaction} from '../../model/transaction/ModifyMultisigAccountTransaction';
4141
import {MosaicAliasTransaction} from '../../model/transaction/MosaicAliasTransaction';
4242
import {MosaicDefinitionTransaction} from '../../model/transaction/MosaicDefinitionTransaction';
@@ -277,13 +277,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
277277
transactionInfo,
278278
);
279279
} else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS) {
280-
return new ModifyAccountPropertyAddressTransaction(
280+
return new AccountAddressRestrictionModificationTransaction(
281281
extractNetworkType(transactionDTO.version),
282282
extractTransactionVersion(transactionDTO.version),
283283
Deadline.createFromDTO(transactionDTO.deadline),
284284
new UInt64(transactionDTO.maxFee || [0, 0]),
285285
transactionDTO.propertyType,
286-
transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountPropertyModification(
286+
transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification(
287287
modificationDTO.type,
288288
modificationDTO.value,
289289
)) : [],
@@ -293,13 +293,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
293293
transactionInfo,
294294
);
295295
} else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE) {
296-
return new ModifyAccountPropertyEntityTypeTransaction(
296+
return new AccountEntityTypeRestrictionModificationTransaction(
297297
extractNetworkType(transactionDTO.version),
298298
extractTransactionVersion(transactionDTO.version),
299299
Deadline.createFromDTO(transactionDTO.deadline),
300300
new UInt64(transactionDTO.maxFee || [0, 0]),
301301
transactionDTO.propertyType,
302-
transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountPropertyModification(
302+
transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification(
303303
modificationDTO.type,
304304
modificationDTO.value,
305305
)) : [],
@@ -309,13 +309,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
309309
transactionInfo,
310310
);
311311
} else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC) {
312-
return new ModifyAccountPropertyMosaicTransaction(
312+
return new AccountMosaicRestrictionModificationTransaction(
313313
extractNetworkType(transactionDTO.version),
314314
extractTransactionVersion(transactionDTO.version),
315315
Deadline.createFromDTO(transactionDTO.deadline),
316316
new UInt64(transactionDTO.maxFee || [0, 0]),
317317
transactionDTO.propertyType,
318-
transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountPropertyModification(
318+
transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification(
319319
modificationDTO.type,
320320
modificationDTO.value,
321321
)) : [],

0 commit comments

Comments
 (0)