Skip to content

Commit 3a75c1e

Browse files
rg911rg911
committed
Model / class - catbuffer consistency renaming
1 parent 3c50732 commit 3a75c1e

33 files changed

+301
-298
lines changed

‎e2e/infrastructure/AccountHttp.spec.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import {assert, expect} from 'chai';
1919
import {AccountHttp} from '../../src/infrastructure/AccountHttp';
2020
import { Listener, TransactionHttp } from '../../src/infrastructure/infrastructure';
2121
import { Account } from '../../src/model/account/Account';
22+
import { AccountRestrictionModificationAction } from '../../src/model/account/AccountRestrictionModificationAction';
2223
import { AccountRestrictionType } from '../../src/model/account/AccountRestrictionType';
2324
import {Address} from '../../src/model/account/Address';
2425
import {PublicAccount} from '../../src/model/account/PublicAccount';
25-
import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType';
2626
import {NetworkType} from '../../src/model/blockchain/NetworkType';
2727
import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic';
2828
import { AliasAction } from '../../src/model/namespace/AliasAction';
@@ -31,12 +31,12 @@ import { AccountRestrictionModification } from '../../src/model/transaction/Acco
3131
import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction';
3232
import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction';
3333
import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction';
34+
import { CosignatoryModificationAction } from '../../src/model/transaction/CosignatoryModificationAction';
3435
import { Deadline } from '../../src/model/transaction/Deadline';
35-
import { ModifyMultisigAccountTransaction } from '../../src/model/transaction/ModifyMultisigAccountTransaction';
36+
import { MultisigAccountModificationTransaction } from '../../src/model/transaction/MultisigAccountModificationTransaction';
3637
import { MultisigCosignatoryModification } from '../../src/model/transaction/MultisigCosignatoryModification';
37-
import { MultisigCosignatoryModificationType } from '../../src/model/transaction/MultisigCosignatoryModificationType';
38+
import { NamespaceRegistrationTransaction } from '../../src/model/transaction/NamespaceRegistrationTransaction';
3839
import { PlainMessage } from '../../src/model/transaction/PlainMessage';
39-
import { RegisterNamespaceTransaction } from '../../src/model/transaction/RegisterNamespaceTransaction';
4040
import { TransferTransaction } from '../../src/model/transaction/TransferTransaction';
4141
import { UInt64 } from '../../src/model/UInt64';
4242

@@ -129,9 +129,9 @@ describe('AccountHttp', () => {
129129
after(() => {
130130
return listener.close();
131131
});
132-
it('Announce RegisterNamespaceTransaction', (done) => {
132+
it('Announce NamespaceRegistrationTransaction', (done) => {
133133
const namespaceName = 'root-test-namespace-' + Math.floor(Math.random() * 10000);
134-
const registerNamespaceTransaction = RegisterNamespaceTransaction.createRootNamespace(
134+
const registerNamespaceTransaction = NamespaceRegistrationTransaction.createRootNamespace(
135135
Deadline.create(),
136136
namespaceName,
137137
UInt64.fromUint(1000),
@@ -195,7 +195,7 @@ describe('AccountHttp', () => {
195195

196196
it('Announce AccountRestrictionTransaction', (done) => {
197197
const addressPropertyFilter = AccountRestrictionModification.createForAddress(
198-
RestrictionModificationType.Add,
198+
AccountRestrictionModificationAction.Add,
199199
account3.address,
200200
);
201201
const addressModification = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction(
@@ -226,14 +226,14 @@ describe('AccountHttp', () => {
226226
after(() => {
227227
return listener.close();
228228
});
229-
it('Announce ModifyMultisigAccountTransaction', (done) => {
230-
const modifyMultisigAccountTransaction = ModifyMultisigAccountTransaction.create(
229+
it('Announce MultisigAccountModificationTransaction', (done) => {
230+
const modifyMultisigAccountTransaction = MultisigAccountModificationTransaction.create(
231231
Deadline.create(),
232232
2,
233233
1,
234-
[ new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Add, cosignAccount1.publicAccount),
235-
new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Add, cosignAccount2.publicAccount),
236-
new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Add, cosignAccount3.publicAccount),
234+
[ new MultisigCosignatoryModification(CosignatoryModificationAction.Add, cosignAccount1.publicAccount),
235+
new MultisigCosignatoryModification(CosignatoryModificationAction.Add, cosignAccount2.publicAccount),
236+
new MultisigCosignatoryModification(CosignatoryModificationAction.Add, cosignAccount3.publicAccount),
237237
],
238238
NetworkType.MIJIN_TEST,
239239
);
@@ -421,7 +421,7 @@ describe('AccountHttp', () => {
421421

422422
it('Announce AccountRestrictionTransaction', (done) => {
423423
const addressPropertyFilter = AccountRestrictionModification.createForAddress(
424-
RestrictionModificationType.Remove,
424+
AccountRestrictionModificationAction.Remove,
425425
account3.address,
426426
);
427427
const addressModification = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction(
@@ -453,29 +453,29 @@ describe('AccountHttp', () => {
453453
after(() => {
454454
return listener.close();
455455
});
456-
it('Announce ModifyMultisigAccountTransaction', (done) => {
457-
const removeCosigner1 = ModifyMultisigAccountTransaction.create(
456+
it('Announce MultisigAccountModificationTransaction', (done) => {
457+
const removeCosigner1 = MultisigAccountModificationTransaction.create(
458458
Deadline.create(),
459459
-1,
460460
0,
461-
[ new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Remove, cosignAccount1.publicAccount),
461+
[ new MultisigCosignatoryModification(CosignatoryModificationAction.Remove, cosignAccount1.publicAccount),
462462
],
463463
NetworkType.MIJIN_TEST,
464464
);
465-
const removeCosigner2 = ModifyMultisigAccountTransaction.create(
465+
const removeCosigner2 = MultisigAccountModificationTransaction.create(
466466
Deadline.create(),
467467
0,
468468
0,
469-
[ new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Remove, cosignAccount2.publicAccount),
469+
[ new MultisigCosignatoryModification(CosignatoryModificationAction.Remove, cosignAccount2.publicAccount),
470470
],
471471
NetworkType.MIJIN_TEST,
472472
);
473473

474-
const removeCosigner3 = ModifyMultisigAccountTransaction.create(
474+
const removeCosigner3 = MultisigAccountModificationTransaction.create(
475475
Deadline.create(),
476476
-1,
477477
-1,
478-
[ new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Remove, cosignAccount3.publicAccount),
478+
[ new MultisigCosignatoryModification(CosignatoryModificationAction.Remove, cosignAccount3.publicAccount),
479479
],
480480
NetworkType.MIJIN_TEST,
481481
);

‎e2e/infrastructure/Listener.spec.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import { MosaicId } from '../../src/model/mosaic/MosaicId';
2525
import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic';
2626
import { NamespaceId } from '../../src/model/namespace/NamespaceId';
2727
import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction';
28+
import { CosignatoryModificationAction } from '../../src/model/transaction/CosignatoryModificationAction';
2829
import { Deadline } from '../../src/model/transaction/Deadline';
29-
import { ModifyMultisigAccountTransaction } from '../../src/model/transaction/ModifyMultisigAccountTransaction';
30+
import { MultisigAccountModificationTransaction } from '../../src/model/transaction/MultisigAccountModificationTransaction';
3031
import { MultisigCosignatoryModification } from '../../src/model/transaction/MultisigCosignatoryModification';
31-
import { MultisigCosignatoryModificationType } from '../../src/model/transaction/MultisigCosignatoryModificationType';
3232
import { PlainMessage } from '../../src/model/transaction/PlainMessage';
3333
import { TransferTransaction } from '../../src/model/transaction/TransferTransaction';
3434
import { TransactionUtils } from './TransactionUtils';
@@ -203,7 +203,7 @@ describe('Listener', () => {
203203
});
204204
});
205205

206-
describe('ModifyMultisigAccountTransaction - Create multisig account', () => {
206+
describe('MultisigAccountModificationTransaction - Create multisig account', () => {
207207
let listener: Listener;
208208
before (() => {
209209
listener = new Listener(config.apiUrl);
@@ -212,14 +212,14 @@ describe('Listener', () => {
212212
after(() => {
213213
return listener.close();
214214
});
215-
it('ModifyMultisigAccountTransaction', (done) => {
216-
const modifyMultisigAccountTransaction = ModifyMultisigAccountTransaction.create(
215+
it('MultisigAccountModificationTransaction', (done) => {
216+
const modifyMultisigAccountTransaction = MultisigAccountModificationTransaction.create(
217217
Deadline.create(),
218218
2,
219219
1,
220-
[ new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Add, cosignAccount1.publicAccount),
221-
new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Add, cosignAccount2.publicAccount),
222-
new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Add, cosignAccount3.publicAccount),
220+
[ new MultisigCosignatoryModification(CosignatoryModificationAction.Add, cosignAccount1.publicAccount),
221+
new MultisigCosignatoryModification(CosignatoryModificationAction.Add, cosignAccount2.publicAccount),
222+
new MultisigCosignatoryModification(CosignatoryModificationAction.Add, cosignAccount3.publicAccount),
223223
],
224224
NetworkType.MIJIN_TEST,
225225
);
@@ -347,7 +347,7 @@ describe('Listener', () => {
347347
});
348348
});
349349

350-
describe('ModifyMultisigAccountTransaction - Restore multisig Accounts', () => {
350+
describe('MultisigAccountModificationTransaction - Restore multisig Accounts', () => {
351351
let listener: Listener;
352352
before (() => {
353353
listener = new Listener(config.apiUrl);
@@ -357,28 +357,28 @@ describe('Listener', () => {
357357
return listener.close();
358358
});
359359
it('Restore Multisig Account', (done) => {
360-
const removeCosigner1 = ModifyMultisigAccountTransaction.create(
360+
const removeCosigner1 = MultisigAccountModificationTransaction.create(
361361
Deadline.create(),
362362
-1,
363363
0,
364-
[ new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Remove, cosignAccount1.publicAccount),
364+
[ new MultisigCosignatoryModification(CosignatoryModificationAction.Remove, cosignAccount1.publicAccount),
365365
],
366366
NetworkType.MIJIN_TEST,
367367
);
368-
const removeCosigner2 = ModifyMultisigAccountTransaction.create(
368+
const removeCosigner2 = MultisigAccountModificationTransaction.create(
369369
Deadline.create(),
370370
0,
371371
0,
372-
[ new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Remove, cosignAccount2.publicAccount),
372+
[ new MultisigCosignatoryModification(CosignatoryModificationAction.Remove, cosignAccount2.publicAccount),
373373
],
374374
NetworkType.MIJIN_TEST,
375375
);
376376

377-
const removeCosigner3 = ModifyMultisigAccountTransaction.create(
377+
const removeCosigner3 = MultisigAccountModificationTransaction.create(
378378
Deadline.create(),
379379
-1,
380380
-1,
381-
[ new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Remove, cosignAccount3.publicAccount),
381+
[ new MultisigCosignatoryModification(CosignatoryModificationAction.Remove, cosignAccount3.publicAccount),
382382
],
383383
NetworkType.MIJIN_TEST,
384384
);
@@ -438,4 +438,4 @@ describe('Listener', () => {
438438
TransactionUtils.createAndAnnounce(account, account.address, transactionHttp, undefined, generationHash);
439439
});
440440
});
441-
});
441+
});

‎e2e/infrastructure/MosaicHttp.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {NamespaceId} from '../../src/model/namespace/NamespaceId';
2626
import { Deadline } from '../../src/model/transaction/Deadline';
2727
import { MosaicAliasTransaction } from '../../src/model/transaction/MosaicAliasTransaction';
2828
import { MosaicDefinitionTransaction } from '../../src/model/transaction/MosaicDefinitionTransaction';
29-
import { RegisterNamespaceTransaction } from '../../src/model/transaction/RegisterNamespaceTransaction';
29+
import { NamespaceRegistrationTransaction } from '../../src/model/transaction/NamespaceRegistrationTransaction';
3030
import { UInt64 } from '../../src/model/UInt64';
3131

3232
describe('MosaicHttp', () => {
@@ -98,9 +98,9 @@ describe('MosaicHttp', () => {
9898
after(() => {
9999
return listener.close();
100100
});
101-
it('Announce RegisterNamespaceTransaction', (done) => {
101+
it('Announce NamespaceRegistrationTransaction', (done) => {
102102
const namespaceName = 'root-test-namespace-' + Math.floor(Math.random() * 10000);
103-
const registerNamespaceTransaction = RegisterNamespaceTransaction.createRootNamespace(
103+
const registerNamespaceTransaction = NamespaceRegistrationTransaction.createRootNamespace(
104104
Deadline.create(),
105105
namespaceName,
106106
UInt64.fromUint(1000),

‎e2e/infrastructure/NamespaceHttp.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ 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';
28-
import { RegisterNamespaceTransaction } from '../../src/model/transaction/RegisterNamespaceTransaction';
28+
import { NamespaceRegistrationTransaction } from '../../src/model/transaction/NamespaceRegistrationTransaction';
2929
import { UInt64 } from '../../src/model/UInt64';
3030

3131
describe('NamespaceHttp', () => {
@@ -51,7 +51,7 @@ describe('NamespaceHttp', () => {
5151
done();
5252
});
5353
});
54-
describe('RegisterNamespaceTransaction', () => {
54+
describe('NamespaceRegistrationTransaction', () => {
5555
let listener: Listener;
5656
before (() => {
5757
listener = new Listener(config.apiUrl);
@@ -62,7 +62,7 @@ describe('NamespaceHttp', () => {
6262
});
6363
it('standalone', (done) => {
6464
const namespaceName = 'root-test-namespace-' + Math.floor(Math.random() * 10000);
65-
const registerNamespaceTransaction = RegisterNamespaceTransaction.createRootNamespace(
65+
const registerNamespaceTransaction = NamespaceRegistrationTransaction.createRootNamespace(
6666
Deadline.create(),
6767
namespaceName,
6868
UInt64.fromUint(1000),

0 commit comments

Comments
 (0)