Skip to content

Fixed #428 Transaction type & version enum name match #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from Jan 29, 2020
Merged

Fixed #428 Transaction type & version enum name match #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions e2e/infrastructure/TransactionHttp.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ describe('TransactionHttp', () => {
const addressModification = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction(
Deadline.create(),
AccountRestrictionFlags.BlockIncomingTransactionType,
[TransactionType.LINK_ACCOUNT],
[TransactionType.ACCOUNT_LINK],
[],
networkType, helper.maxFee,
);
Expand All @@ -551,7 +551,7 @@ describe('TransactionHttp', () => {
Deadline.create(),
AccountRestrictionFlags.BlockIncomingTransactionType,
[],
[TransactionType.LINK_ACCOUNT],
[TransactionType.ACCOUNT_LINK],
networkType, helper.maxFee,
);
const aggregateTransaction = AggregateTransaction.createComplete(Deadline.create(),
Expand All @@ -569,12 +569,12 @@ describe('TransactionHttp', () => {
it('standalone', () => {
AccountRestrictionModification.createForOperation(
AccountRestrictionModificationAction.Add,
TransactionType.LINK_ACCOUNT,
TransactionType.ACCOUNT_LINK,
);
const addressModification = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction(
Deadline.create(),
AccountRestrictionFlags.BlockOutgoingTransactionType,
[TransactionType.LINK_ACCOUNT],
[TransactionType.ACCOUNT_LINK],
[],
networkType, helper.maxFee,
);
Expand All @@ -595,7 +595,7 @@ describe('TransactionHttp', () => {
Deadline.create(),
AccountRestrictionFlags.BlockOutgoingTransactionType,
[],
[TransactionType.LINK_ACCOUNT],
[TransactionType.ACCOUNT_LINK],
networkType, helper.maxFee,
);
const aggregateTransaction = AggregateTransaction.createComplete(Deadline.create(),
Expand Down
6 changes: 3 additions & 3 deletions e2e/service/MetadataTransactionService.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ describe('MetadataTransactionService', () => {
newValue,
targetAccount.publicAccount,
).subscribe((transaction: AccountMetadataTransaction) => {
expect(transaction.type).to.be.equal(TransactionType.ACCOUNT_METADATA_TRANSACTION);
expect(transaction.type).to.be.equal(TransactionType.ACCOUNT_METADATA);
expect(transaction.scopedMetadataKey.toHex()).to.be.equal(key.toHex());
expect(transaction.value).to.be.equal(newValue);
expect(transaction.targetPublicKey).to.be.equal(targetAccount.publicKey);
Expand All @@ -180,7 +180,7 @@ describe('MetadataTransactionService', () => {
targetAccount.publicAccount,
mosaicId,
).subscribe((transaction: MosaicMetadataTransaction) => {
expect(transaction.type).to.be.equal(TransactionType.MOSAIC_METADATA_TRANSACTION);
expect(transaction.type).to.be.equal(TransactionType.MOSAIC_METADATA);
expect(transaction.scopedMetadataKey.toHex()).to.be.equal(key.toHex());
expect(transaction.valueSizeDelta).to.be.equal(5);
expect(transaction.value).to.be.equal(newValue + 'delta');
Expand All @@ -202,7 +202,7 @@ describe('MetadataTransactionService', () => {
targetAccount.publicAccount,
namespaceId,
).subscribe((transaction: NamespaceMetadataTransaction) => {
expect(transaction.type).to.be.equal(TransactionType.NAMESPACE_METADATA_TRANSACTION);
expect(transaction.type).to.be.equal(TransactionType.NAMESPACE_METADATA);
expect(transaction.scopedMetadataKey.toHex()).to.be.equal(key.toHex());
expect(transaction.valueSizeDelta).to.be.equal(5);
expect(transaction.value).to.be.equal(newValue + 'delta');
Expand Down
20 changes: 10 additions & 10 deletions src/infrastructure/transaction/CreateTransactionFromDTO.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
transactionDTO.network) : undefined,
transactionInfo,
);
} else if (transactionDTO.type === TransactionType.REGISTER_NAMESPACE) {
} else if (transactionDTO.type === TransactionType.NAMESPACE_REGISTRATION) {
return new NamespaceRegistrationTransaction(
transactionDTO.network,
transactionDTO.version,
Expand Down Expand Up @@ -183,7 +183,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
transactionDTO.network) : undefined,
transactionInfo,
);
} else if (transactionDTO.type === TransactionType.MODIFY_MULTISIG_ACCOUNT) {
} else if (transactionDTO.type === TransactionType.MULTISIG_ACCOUNT_MODIFICATION) {
return new MultisigAccountModificationTransaction(
transactionDTO.network,
transactionDTO.version,
Expand All @@ -200,7 +200,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
transactionDTO.network) : undefined,
transactionInfo,
);
} else if (transactionDTO.type === TransactionType.LOCK) {
} else if (transactionDTO.type === TransactionType.HASH_LOCK) {
const networkType = transactionDTO.network;
return new LockFundsTransaction(
networkType,
Expand Down Expand Up @@ -276,7 +276,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
transactionDTO.network) : undefined,
transactionInfo,
);
} else if (transactionDTO.type === TransactionType.ACCOUNT_RESTRICTION_ADDRESS) {
} else if (transactionDTO.type === TransactionType.ACCOUNT_ADDRESS_RESTRICTION) {
return new AccountAddressRestrictionTransaction(
transactionDTO.network,
transactionDTO.version,
Expand All @@ -292,7 +292,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
transactionDTO.network) : undefined,
transactionInfo,
);
} else if (transactionDTO.type === TransactionType.ACCOUNT_RESTRICTION_OPERATION) {
} else if (transactionDTO.type === TransactionType.ACCOUNT_OPERATION_RESTRICTION) {
return new AccountOperationRestrictionTransaction(
transactionDTO.network,
transactionDTO.version,
Expand All @@ -306,7 +306,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
transactionDTO.network) : undefined,
transactionInfo,
);
} else if (transactionDTO.type === TransactionType.ACCOUNT_RESTRICTION_MOSAIC) {
} else if (transactionDTO.type === TransactionType.ACCOUNT_MOSAIC_RESTRICTION) {
return new AccountMosaicRestrictionTransaction(
transactionDTO.network,
transactionDTO.version,
Expand All @@ -322,7 +322,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
transactionDTO.network) : undefined,
transactionInfo,
);
} else if (transactionDTO.type === TransactionType.LINK_ACCOUNT) {
} else if (transactionDTO.type === TransactionType.ACCOUNT_LINK) {
return new AccountLinkTransaction(
transactionDTO.network,
transactionDTO.version,
Expand Down Expand Up @@ -369,7 +369,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
transactionDTO.network) : undefined,
transactionInfo,
);
} else if (transactionDTO.type === TransactionType.ACCOUNT_METADATA_TRANSACTION) {
} else if (transactionDTO.type === TransactionType.ACCOUNT_METADATA) {
return new AccountMetadataTransaction(
transactionDTO.network,
transactionDTO.version,
Expand All @@ -384,7 +384,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
transactionDTO.network) : undefined,
transactionInfo,
);
} else if (transactionDTO.type === TransactionType.MOSAIC_METADATA_TRANSACTION) {
} else if (transactionDTO.type === TransactionType.MOSAIC_METADATA) {
return new MosaicMetadataTransaction(
transactionDTO.network,
transactionDTO.version,
Expand All @@ -400,7 +400,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
transactionDTO.network) : undefined,
transactionInfo,
);
} else if (transactionDTO.type === TransactionType.NAMESPACE_METADATA_TRANSACTION) {
} else if (transactionDTO.type === TransactionType.NAMESPACE_METADATA) {
return new NamespaceMetadataTransaction(
transactionDTO.network,
transactionDTO.version,
Expand Down
26 changes: 13 additions & 13 deletions src/infrastructure/transaction/CreateTransactionFromPayload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,19 @@ export const CreateTransactionFromPayload = (payload: string,
TransactionBuilder.loadFromBinary(convert.hexToUint8(payload));
const type = transactionBuilder.getType().valueOf();
switch (type) {
case TransactionType.ACCOUNT_RESTRICTION_ADDRESS:
case TransactionType.ACCOUNT_RESTRICTION_OPERATION:
case TransactionType.ACCOUNT_RESTRICTION_MOSAIC:
case TransactionType.ACCOUNT_ADDRESS_RESTRICTION:
case TransactionType.ACCOUNT_OPERATION_RESTRICTION:
case TransactionType.ACCOUNT_MOSAIC_RESTRICTION:
switch (type) {
case TransactionType.ACCOUNT_RESTRICTION_ADDRESS:
case TransactionType.ACCOUNT_ADDRESS_RESTRICTION:
return AccountAddressRestrictionTransaction.createFromPayload(payload, isEmbedded);
case TransactionType.ACCOUNT_RESTRICTION_MOSAIC:
case TransactionType.ACCOUNT_MOSAIC_RESTRICTION:
return AccountMosaicRestrictionTransaction.createFromPayload(payload, isEmbedded);
case TransactionType.ACCOUNT_RESTRICTION_OPERATION:
case TransactionType.ACCOUNT_OPERATION_RESTRICTION:
return AccountOperationRestrictionTransaction.createFromPayload(payload, isEmbedded);
}
throw new Error ('Account restriction transaction type not recognised.');
case TransactionType.LINK_ACCOUNT:
case TransactionType.ACCOUNT_LINK:
return AccountLinkTransaction.createFromPayload(payload, isEmbedded);
case TransactionType.ADDRESS_ALIAS:
return AddressAliasTransaction.createFromPayload(payload, isEmbedded);
Expand All @@ -75,27 +75,27 @@ export const CreateTransactionFromPayload = (payload: string,
return MosaicDefinitionTransaction.createFromPayload(payload, isEmbedded);
case TransactionType.MOSAIC_SUPPLY_CHANGE:
return MosaicSupplyChangeTransaction.createFromPayload(payload, isEmbedded);
case TransactionType.REGISTER_NAMESPACE:
case TransactionType.NAMESPACE_REGISTRATION:
return NamespaceRegistrationTransaction.createFromPayload(payload, isEmbedded);
case TransactionType.TRANSFER:
return TransferTransaction.createFromPayload(payload, isEmbedded);
case TransactionType.SECRET_LOCK:
return SecretLockTransaction.createFromPayload(payload, isEmbedded);
case TransactionType.SECRET_PROOF:
return SecretProofTransaction.createFromPayload(payload, isEmbedded);
case TransactionType.MODIFY_MULTISIG_ACCOUNT:
case TransactionType.MULTISIG_ACCOUNT_MODIFICATION:
return MultisigAccountModificationTransaction.createFromPayload(payload, isEmbedded);
case TransactionType.LOCK:
case TransactionType.HASH_LOCK:
return LockFundsTransaction.createFromPayload(payload, isEmbedded);
case TransactionType.MOSAIC_GLOBAL_RESTRICTION:
return MosaicGlobalRestrictionTransaction.createFromPayload(payload, isEmbedded);
case TransactionType.MOSAIC_ADDRESS_RESTRICTION:
return MosaicAddressRestrictionTransaction.createFromPayload(payload, isEmbedded);
case TransactionType.ACCOUNT_METADATA_TRANSACTION:
case TransactionType.ACCOUNT_METADATA:
return AccountMetadataTransaction.createFromPayload(payload, isEmbedded);
case TransactionType.MOSAIC_METADATA_TRANSACTION:
case TransactionType.MOSAIC_METADATA:
return MosaicMetadataTransaction.createFromPayload(payload, isEmbedded);
case TransactionType.NAMESPACE_METADATA_TRANSACTION:
case TransactionType.NAMESPACE_METADATA:
return NamespaceMetadataTransaction.createFromPayload(payload, isEmbedded);
case TransactionType.AGGREGATE_COMPLETE:
case TransactionType.AGGREGATE_BONDED:
Expand Down
20 changes: 10 additions & 10 deletions src/infrastructure/transaction/SerializeTransactionToJSON.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import { TransferTransaction } from '../../model/transaction/TransferTransaction
*/
export const SerializeTransactionToJSON = (transaction: Transaction): any => {
switch (transaction.type) {
case TransactionType.LINK_ACCOUNT:
case TransactionType.ACCOUNT_LINK:
const accountLinkTx = transaction as AccountLinkTransaction;
return {
remotePublicKey: accountLinkTx.remotePublicKey,
Expand All @@ -70,15 +70,15 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
return cosignature.toDTO();
}),
};
case TransactionType.LOCK:
case TransactionType.HASH_LOCK:
const LockFundTx = transaction as LockFundsTransaction;
return {
mosaicId: LockFundTx.mosaic.id.id,
amount: LockFundTx.mosaic.amount.toString(),
duration: LockFundTx.duration.toString(),
hash: LockFundTx.hash,
};
case TransactionType.ACCOUNT_RESTRICTION_ADDRESS:
case TransactionType.ACCOUNT_ADDRESS_RESTRICTION:
const accountAddressRestrictionTx = transaction as AccountAddressRestrictionTransaction;
return {
restrictionFlags: accountAddressRestrictionTx.restrictionFlags,
Expand All @@ -91,7 +91,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
return deletion.toDTO();
}),
};
case TransactionType.ACCOUNT_RESTRICTION_OPERATION:
case TransactionType.ACCOUNT_OPERATION_RESTRICTION:
const accountOperationRestrictionTx = transaction as AccountOperationRestrictionTransaction;
return {
restrictionFlags: accountOperationRestrictionTx.restrictionFlags,
Expand All @@ -104,7 +104,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
return deletion;
}),
};
case TransactionType.ACCOUNT_RESTRICTION_MOSAIC:
case TransactionType.ACCOUNT_MOSAIC_RESTRICTION:
const accountMosaicRestrictionTx = transaction as AccountMosaicRestrictionTransaction;
return {
restrictionFlags: accountMosaicRestrictionTx.restrictionFlags,
Expand All @@ -117,7 +117,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
return deletion.toHex();
}),
};
case TransactionType.MODIFY_MULTISIG_ACCOUNT:
case TransactionType.MULTISIG_ACCOUNT_MODIFICATION:
const multisigTx = transaction as MultisigAccountModificationTransaction;
return {
minApprovalDelta: multisigTx.minApprovalDelta,
Expand Down Expand Up @@ -152,7 +152,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
action: mosaicSupplyTx.action,
delta: mosaicSupplyTx.delta.toString(),
};
case TransactionType.REGISTER_NAMESPACE:
case TransactionType.NAMESPACE_REGISTRATION:
const namespaceTx = transaction as NamespaceRegistrationTransaction;
const registerNamespaceDuration = namespaceTx.duration;
const registerNamespaceParentId = namespaceTx.parentId;
Expand Down Expand Up @@ -218,7 +218,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
newRestrictionValue: mosaicAddressRestrictionTx.newRestrictionValue.toString(),

};
case TransactionType.ACCOUNT_METADATA_TRANSACTION:
case TransactionType.ACCOUNT_METADATA:
const accountMetadataTx = transaction as AccountMetadataTransaction;
return {
targetPublicKey: accountMetadataTx.targetPublicKey,
Expand All @@ -228,7 +228,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
value: Convert.utf8ToHex(accountMetadataTx.value),

};
case TransactionType.MOSAIC_METADATA_TRANSACTION:
case TransactionType.MOSAIC_METADATA:
const mosaicMetadataTx = transaction as MosaicMetadataTransaction;
return {
targetPublicKey: mosaicMetadataTx.targetPublicKey,
Expand All @@ -239,7 +239,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
value: Convert.utf8ToHex(mosaicMetadataTx.value),

};
case TransactionType.NAMESPACE_METADATA_TRANSACTION:
case TransactionType.NAMESPACE_METADATA:
const namespaceMetaTx = transaction as NamespaceMetadataTransaction;
return {
targetPublicKey: namespaceMetaTx.targetPublicKey,
Expand Down
8 changes: 4 additions & 4 deletions src/model/transaction/AccountAddressRestrictionTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export class AccountAddressRestrictionTransaction extends Transaction {
networkType: NetworkType,
maxFee: UInt64 = new UInt64([0, 0])): AccountAddressRestrictionTransaction {
return new AccountAddressRestrictionTransaction(networkType,
TransactionVersion.ACCOUNT_RESTRICTION_ADDRESS,
TransactionVersion.ACCOUNT_ADDRESS_RESTRICTION,
deadline,
maxFee,
restrictionFlags,
Expand Down Expand Up @@ -90,7 +90,7 @@ export class AccountAddressRestrictionTransaction extends Transaction {
signature?: string,
signer?: PublicAccount,
transactionInfo?: TransactionInfo) {
super(TransactionType.ACCOUNT_RESTRICTION_ADDRESS,
super(TransactionType.ACCOUNT_ADDRESS_RESTRICTION,
networkType, version, deadline, maxFee, signature, signer, transactionInfo);
}

Expand Down Expand Up @@ -158,7 +158,7 @@ export class AccountAddressRestrictionTransaction extends Transaction {
new KeyDto(signerBuffer),
this.versionToDTO(),
this.networkType.valueOf(),
TransactionType.ACCOUNT_RESTRICTION_ADDRESS.valueOf(),
TransactionType.ACCOUNT_ADDRESS_RESTRICTION.valueOf(),
new AmountDto(this.maxFee.toDTO()),
new TimestampDto(this.deadline.toDTO()),
this.restrictionFlags.valueOf(),
Expand All @@ -181,7 +181,7 @@ export class AccountAddressRestrictionTransaction extends Transaction {
new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
this.versionToDTO(),
this.networkType.valueOf(),
TransactionType.ACCOUNT_RESTRICTION_ADDRESS.valueOf(),
TransactionType.ACCOUNT_ADDRESS_RESTRICTION.valueOf(),
this.restrictionFlags.valueOf(),
this.restrictionAdditions.map((addition) => {
return new UnresolvedAddressDto(UnresolvedMapping.toUnresolvedAddressBytes(addition, this.networkType));
Expand Down
Loading