Skip to content

Commit 5f7dacc

Browse files
rg911rg911
authored
Merge branch 'master' into task/g402_resolution_statement
2 parents 5f13a25 + 1633964 commit 5f7dacc

24 files changed

+140
-140
lines changed

‎e2e/infrastructure/TransactionHttp.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ describe('TransactionHttp', () => {
531531
const addressModification = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction(
532532
Deadline.create(),
533533
AccountRestrictionFlags.BlockIncomingTransactionType,
534-
[TransactionType.LINK_ACCOUNT],
534+
[TransactionType.ACCOUNT_LINK],
535535
[],
536536
networkType, helper.maxFee,
537537
);
@@ -551,7 +551,7 @@ describe('TransactionHttp', () => {
551551
Deadline.create(),
552552
AccountRestrictionFlags.BlockIncomingTransactionType,
553553
[],
554-
[TransactionType.LINK_ACCOUNT],
554+
[TransactionType.ACCOUNT_LINK],
555555
networkType, helper.maxFee,
556556
);
557557
const aggregateTransaction = AggregateTransaction.createComplete(Deadline.create(),
@@ -569,12 +569,12 @@ describe('TransactionHttp', () => {
569569
it('standalone', () => {
570570
AccountRestrictionModification.createForOperation(
571571
AccountRestrictionModificationAction.Add,
572-
TransactionType.LINK_ACCOUNT,
572+
TransactionType.ACCOUNT_LINK,
573573
);
574574
const addressModification = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction(
575575
Deadline.create(),
576576
AccountRestrictionFlags.BlockOutgoingTransactionType,
577-
[TransactionType.LINK_ACCOUNT],
577+
[TransactionType.ACCOUNT_LINK],
578578
[],
579579
networkType, helper.maxFee,
580580
);
@@ -595,7 +595,7 @@ describe('TransactionHttp', () => {
595595
Deadline.create(),
596596
AccountRestrictionFlags.BlockOutgoingTransactionType,
597597
[],
598-
[TransactionType.LINK_ACCOUNT],
598+
[TransactionType.ACCOUNT_LINK],
599599
networkType, helper.maxFee,
600600
);
601601
const aggregateTransaction = AggregateTransaction.createComplete(Deadline.create(),

‎e2e/service/MetadataTransactionService.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ describe('MetadataTransactionService', () => {
160160
newValue,
161161
targetAccount.publicAccount,
162162
).subscribe((transaction: AccountMetadataTransaction) => {
163-
expect(transaction.type).to.be.equal(TransactionType.ACCOUNT_METADATA_TRANSACTION);
163+
expect(transaction.type).to.be.equal(TransactionType.ACCOUNT_METADATA);
164164
expect(transaction.scopedMetadataKey.toHex()).to.be.equal(key.toHex());
165165
expect(transaction.value).to.be.equal(newValue);
166166
expect(transaction.targetPublicKey).to.be.equal(targetAccount.publicKey);
@@ -180,7 +180,7 @@ describe('MetadataTransactionService', () => {
180180
targetAccount.publicAccount,
181181
mosaicId,
182182
).subscribe((transaction: MosaicMetadataTransaction) => {
183-
expect(transaction.type).to.be.equal(TransactionType.MOSAIC_METADATA_TRANSACTION);
183+
expect(transaction.type).to.be.equal(TransactionType.MOSAIC_METADATA);
184184
expect(transaction.scopedMetadataKey.toHex()).to.be.equal(key.toHex());
185185
expect(transaction.valueSizeDelta).to.be.equal(5);
186186
expect(transaction.value).to.be.equal(newValue + 'delta');
@@ -202,7 +202,7 @@ describe('MetadataTransactionService', () => {
202202
targetAccount.publicAccount,
203203
namespaceId,
204204
).subscribe((transaction: NamespaceMetadataTransaction) => {
205-
expect(transaction.type).to.be.equal(TransactionType.NAMESPACE_METADATA_TRANSACTION);
205+
expect(transaction.type).to.be.equal(TransactionType.NAMESPACE_METADATA);
206206
expect(transaction.scopedMetadataKey.toHex()).to.be.equal(key.toHex());
207207
expect(transaction.valueSizeDelta).to.be.equal(5);
208208
expect(transaction.value).to.be.equal(newValue + 'delta');

‎src/infrastructure/transaction/CreateTransactionFromDTO.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
137137
transactionDTO.network) : undefined,
138138
transactionInfo,
139139
);
140-
} else if (transactionDTO.type === TransactionType.REGISTER_NAMESPACE) {
140+
} else if (transactionDTO.type === TransactionType.NAMESPACE_REGISTRATION) {
141141
return new NamespaceRegistrationTransaction(
142142
transactionDTO.network,
143143
transactionDTO.version,
@@ -183,7 +183,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
183183
transactionDTO.network) : undefined,
184184
transactionInfo,
185185
);
186-
} else if (transactionDTO.type === TransactionType.MODIFY_MULTISIG_ACCOUNT) {
186+
} else if (transactionDTO.type === TransactionType.MULTISIG_ACCOUNT_MODIFICATION) {
187187
return new MultisigAccountModificationTransaction(
188188
transactionDTO.network,
189189
transactionDTO.version,
@@ -200,7 +200,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
200200
transactionDTO.network) : undefined,
201201
transactionInfo,
202202
);
203-
} else if (transactionDTO.type === TransactionType.LOCK) {
203+
} else if (transactionDTO.type === TransactionType.HASH_LOCK) {
204204
const networkType = transactionDTO.network;
205205
return new LockFundsTransaction(
206206
networkType,
@@ -276,7 +276,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
276276
transactionDTO.network) : undefined,
277277
transactionInfo,
278278
);
279-
} else if (transactionDTO.type === TransactionType.ACCOUNT_RESTRICTION_ADDRESS) {
279+
} else if (transactionDTO.type === TransactionType.ACCOUNT_ADDRESS_RESTRICTION) {
280280
return new AccountAddressRestrictionTransaction(
281281
transactionDTO.network,
282282
transactionDTO.version,
@@ -292,7 +292,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
292292
transactionDTO.network) : undefined,
293293
transactionInfo,
294294
);
295-
} else if (transactionDTO.type === TransactionType.ACCOUNT_RESTRICTION_OPERATION) {
295+
} else if (transactionDTO.type === TransactionType.ACCOUNT_OPERATION_RESTRICTION) {
296296
return new AccountOperationRestrictionTransaction(
297297
transactionDTO.network,
298298
transactionDTO.version,
@@ -306,7 +306,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
306306
transactionDTO.network) : undefined,
307307
transactionInfo,
308308
);
309-
} else if (transactionDTO.type === TransactionType.ACCOUNT_RESTRICTION_MOSAIC) {
309+
} else if (transactionDTO.type === TransactionType.ACCOUNT_MOSAIC_RESTRICTION) {
310310
return new AccountMosaicRestrictionTransaction(
311311
transactionDTO.network,
312312
transactionDTO.version,
@@ -322,7 +322,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
322322
transactionDTO.network) : undefined,
323323
transactionInfo,
324324
);
325-
} else if (transactionDTO.type === TransactionType.LINK_ACCOUNT) {
325+
} else if (transactionDTO.type === TransactionType.ACCOUNT_LINK) {
326326
return new AccountLinkTransaction(
327327
transactionDTO.network,
328328
transactionDTO.version,
@@ -369,7 +369,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
369369
transactionDTO.network) : undefined,
370370
transactionInfo,
371371
);
372-
} else if (transactionDTO.type === TransactionType.ACCOUNT_METADATA_TRANSACTION) {
372+
} else if (transactionDTO.type === TransactionType.ACCOUNT_METADATA) {
373373
return new AccountMetadataTransaction(
374374
transactionDTO.network,
375375
transactionDTO.version,
@@ -384,7 +384,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
384384
transactionDTO.network) : undefined,
385385
transactionInfo,
386386
);
387-
} else if (transactionDTO.type === TransactionType.MOSAIC_METADATA_TRANSACTION) {
387+
} else if (transactionDTO.type === TransactionType.MOSAIC_METADATA) {
388388
return new MosaicMetadataTransaction(
389389
transactionDTO.network,
390390
transactionDTO.version,
@@ -400,7 +400,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
400400
transactionDTO.network) : undefined,
401401
transactionInfo,
402402
);
403-
} else if (transactionDTO.type === TransactionType.NAMESPACE_METADATA_TRANSACTION) {
403+
} else if (transactionDTO.type === TransactionType.NAMESPACE_METADATA) {
404404
return new NamespaceMetadataTransaction(
405405
transactionDTO.network,
406406
transactionDTO.version,

‎src/infrastructure/transaction/CreateTransactionFromPayload.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,19 @@ export const CreateTransactionFromPayload = (payload: string,
5353
TransactionBuilder.loadFromBinary(convert.hexToUint8(payload));
5454
const type = transactionBuilder.getType().valueOf();
5555
switch (type) {
56-
case TransactionType.ACCOUNT_RESTRICTION_ADDRESS:
57-
case TransactionType.ACCOUNT_RESTRICTION_OPERATION:
58-
case TransactionType.ACCOUNT_RESTRICTION_MOSAIC:
56+
case TransactionType.ACCOUNT_ADDRESS_RESTRICTION:
57+
case TransactionType.ACCOUNT_OPERATION_RESTRICTION:
58+
case TransactionType.ACCOUNT_MOSAIC_RESTRICTION:
5959
switch (type) {
60-
case TransactionType.ACCOUNT_RESTRICTION_ADDRESS:
60+
case TransactionType.ACCOUNT_ADDRESS_RESTRICTION:
6161
return AccountAddressRestrictionTransaction.createFromPayload(payload, isEmbedded);
62-
case TransactionType.ACCOUNT_RESTRICTION_MOSAIC:
62+
case TransactionType.ACCOUNT_MOSAIC_RESTRICTION:
6363
return AccountMosaicRestrictionTransaction.createFromPayload(payload, isEmbedded);
64-
case TransactionType.ACCOUNT_RESTRICTION_OPERATION:
64+
case TransactionType.ACCOUNT_OPERATION_RESTRICTION:
6565
return AccountOperationRestrictionTransaction.createFromPayload(payload, isEmbedded);
6666
}
6767
throw new Error ('Account restriction transaction type not recognised.');
68-
case TransactionType.LINK_ACCOUNT:
68+
case TransactionType.ACCOUNT_LINK:
6969
return AccountLinkTransaction.createFromPayload(payload, isEmbedded);
7070
case TransactionType.ADDRESS_ALIAS:
7171
return AddressAliasTransaction.createFromPayload(payload, isEmbedded);
@@ -75,27 +75,27 @@ export const CreateTransactionFromPayload = (payload: string,
7575
return MosaicDefinitionTransaction.createFromPayload(payload, isEmbedded);
7676
case TransactionType.MOSAIC_SUPPLY_CHANGE:
7777
return MosaicSupplyChangeTransaction.createFromPayload(payload, isEmbedded);
78-
case TransactionType.REGISTER_NAMESPACE:
78+
case TransactionType.NAMESPACE_REGISTRATION:
7979
return NamespaceRegistrationTransaction.createFromPayload(payload, isEmbedded);
8080
case TransactionType.TRANSFER:
8181
return TransferTransaction.createFromPayload(payload, isEmbedded);
8282
case TransactionType.SECRET_LOCK:
8383
return SecretLockTransaction.createFromPayload(payload, isEmbedded);
8484
case TransactionType.SECRET_PROOF:
8585
return SecretProofTransaction.createFromPayload(payload, isEmbedded);
86-
case TransactionType.MODIFY_MULTISIG_ACCOUNT:
86+
case TransactionType.MULTISIG_ACCOUNT_MODIFICATION:
8787
return MultisigAccountModificationTransaction.createFromPayload(payload, isEmbedded);
88-
case TransactionType.LOCK:
88+
case TransactionType.HASH_LOCK:
8989
return LockFundsTransaction.createFromPayload(payload, isEmbedded);
9090
case TransactionType.MOSAIC_GLOBAL_RESTRICTION:
9191
return MosaicGlobalRestrictionTransaction.createFromPayload(payload, isEmbedded);
9292
case TransactionType.MOSAIC_ADDRESS_RESTRICTION:
9393
return MosaicAddressRestrictionTransaction.createFromPayload(payload, isEmbedded);
94-
case TransactionType.ACCOUNT_METADATA_TRANSACTION:
94+
case TransactionType.ACCOUNT_METADATA:
9595
return AccountMetadataTransaction.createFromPayload(payload, isEmbedded);
96-
case TransactionType.MOSAIC_METADATA_TRANSACTION:
96+
case TransactionType.MOSAIC_METADATA:
9797
return MosaicMetadataTransaction.createFromPayload(payload, isEmbedded);
98-
case TransactionType.NAMESPACE_METADATA_TRANSACTION:
98+
case TransactionType.NAMESPACE_METADATA:
9999
return NamespaceMetadataTransaction.createFromPayload(payload, isEmbedded);
100100
case TransactionType.AGGREGATE_COMPLETE:
101101
case TransactionType.AGGREGATE_BONDED:

‎src/infrastructure/transaction/SerializeTransactionToJSON.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import { TransferTransaction } from '../../model/transaction/TransferTransaction
4646
*/
4747
export const SerializeTransactionToJSON = (transaction: Transaction): any => {
4848
switch (transaction.type) {
49-
case TransactionType.LINK_ACCOUNT:
49+
case TransactionType.ACCOUNT_LINK:
5050
const accountLinkTx = transaction as AccountLinkTransaction;
5151
return {
5252
remotePublicKey: accountLinkTx.remotePublicKey,
@@ -70,15 +70,15 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
7070
return cosignature.toDTO();
7171
}),
7272
};
73-
case TransactionType.LOCK:
73+
case TransactionType.HASH_LOCK:
7474
const LockFundTx = transaction as LockFundsTransaction;
7575
return {
7676
mosaicId: LockFundTx.mosaic.id.id,
7777
amount: LockFundTx.mosaic.amount.toString(),
7878
duration: LockFundTx.duration.toString(),
7979
hash: LockFundTx.hash,
8080
};
81-
case TransactionType.ACCOUNT_RESTRICTION_ADDRESS:
81+
case TransactionType.ACCOUNT_ADDRESS_RESTRICTION:
8282
const accountAddressRestrictionTx = transaction as AccountAddressRestrictionTransaction;
8383
return {
8484
restrictionFlags: accountAddressRestrictionTx.restrictionFlags,
@@ -91,7 +91,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
9191
return deletion.toDTO();
9292
}),
9393
};
94-
case TransactionType.ACCOUNT_RESTRICTION_OPERATION:
94+
case TransactionType.ACCOUNT_OPERATION_RESTRICTION:
9595
const accountOperationRestrictionTx = transaction as AccountOperationRestrictionTransaction;
9696
return {
9797
restrictionFlags: accountOperationRestrictionTx.restrictionFlags,
@@ -104,7 +104,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
104104
return deletion;
105105
}),
106106
};
107-
case TransactionType.ACCOUNT_RESTRICTION_MOSAIC:
107+
case TransactionType.ACCOUNT_MOSAIC_RESTRICTION:
108108
const accountMosaicRestrictionTx = transaction as AccountMosaicRestrictionTransaction;
109109
return {
110110
restrictionFlags: accountMosaicRestrictionTx.restrictionFlags,
@@ -117,7 +117,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
117117
return deletion.toHex();
118118
}),
119119
};
120-
case TransactionType.MODIFY_MULTISIG_ACCOUNT:
120+
case TransactionType.MULTISIG_ACCOUNT_MODIFICATION:
121121
const multisigTx = transaction as MultisigAccountModificationTransaction;
122122
return {
123123
minApprovalDelta: multisigTx.minApprovalDelta,
@@ -152,7 +152,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
152152
action: mosaicSupplyTx.action,
153153
delta: mosaicSupplyTx.delta.toString(),
154154
};
155-
case TransactionType.REGISTER_NAMESPACE:
155+
case TransactionType.NAMESPACE_REGISTRATION:
156156
const namespaceTx = transaction as NamespaceRegistrationTransaction;
157157
const registerNamespaceDuration = namespaceTx.duration;
158158
const registerNamespaceParentId = namespaceTx.parentId;
@@ -218,7 +218,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
218218
newRestrictionValue: mosaicAddressRestrictionTx.newRestrictionValue.toString(),
219219

220220
};
221-
case TransactionType.ACCOUNT_METADATA_TRANSACTION:
221+
case TransactionType.ACCOUNT_METADATA:
222222
const accountMetadataTx = transaction as AccountMetadataTransaction;
223223
return {
224224
targetPublicKey: accountMetadataTx.targetPublicKey,
@@ -228,7 +228,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
228228
value: Convert.utf8ToHex(accountMetadataTx.value),
229229

230230
};
231-
case TransactionType.MOSAIC_METADATA_TRANSACTION:
231+
case TransactionType.MOSAIC_METADATA:
232232
const mosaicMetadataTx = transaction as MosaicMetadataTransaction;
233233
return {
234234
targetPublicKey: mosaicMetadataTx.targetPublicKey,
@@ -239,7 +239,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
239239
value: Convert.utf8ToHex(mosaicMetadataTx.value),
240240

241241
};
242-
case TransactionType.NAMESPACE_METADATA_TRANSACTION:
242+
case TransactionType.NAMESPACE_METADATA:
243243
const namespaceMetaTx = transaction as NamespaceMetadataTransaction;
244244
return {
245245
targetPublicKey: namespaceMetaTx.targetPublicKey,

‎src/model/transaction/AccountAddressRestrictionTransaction.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export class AccountAddressRestrictionTransaction extends Transaction {
6060
networkType: NetworkType,
6161
maxFee: UInt64 = new UInt64([0, 0])): AccountAddressRestrictionTransaction {
6262
return new AccountAddressRestrictionTransaction(networkType,
63-
TransactionVersion.ACCOUNT_RESTRICTION_ADDRESS,
63+
TransactionVersion.ACCOUNT_ADDRESS_RESTRICTION,
6464
deadline,
6565
maxFee,
6666
restrictionFlags,
@@ -90,7 +90,7 @@ export class AccountAddressRestrictionTransaction extends Transaction {
9090
signature?: string,
9191
signer?: PublicAccount,
9292
transactionInfo?: TransactionInfo) {
93-
super(TransactionType.ACCOUNT_RESTRICTION_ADDRESS,
93+
super(TransactionType.ACCOUNT_ADDRESS_RESTRICTION,
9494
networkType, version, deadline, maxFee, signature, signer, transactionInfo);
9595
}
9696

@@ -158,7 +158,7 @@ export class AccountAddressRestrictionTransaction extends Transaction {
158158
new KeyDto(signerBuffer),
159159
this.versionToDTO(),
160160
this.networkType.valueOf(),
161-
TransactionType.ACCOUNT_RESTRICTION_ADDRESS.valueOf(),
161+
TransactionType.ACCOUNT_ADDRESS_RESTRICTION.valueOf(),
162162
new AmountDto(this.maxFee.toDTO()),
163163
new TimestampDto(this.deadline.toDTO()),
164164
this.restrictionFlags.valueOf(),
@@ -181,7 +181,7 @@ export class AccountAddressRestrictionTransaction extends Transaction {
181181
new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
182182
this.versionToDTO(),
183183
this.networkType.valueOf(),
184-
TransactionType.ACCOUNT_RESTRICTION_ADDRESS.valueOf(),
184+
TransactionType.ACCOUNT_ADDRESS_RESTRICTION.valueOf(),
185185
this.restrictionFlags.valueOf(),
186186
this.restrictionAdditions.map((addition) => {
187187
return new UnresolvedAddressDto(UnresolvedMapping.toUnresolvedAddressBytes(addition, this.networkType));

0 commit comments

Comments
 (0)