Merge pull request #162 from rg911/master

Fixed bug on transaction serliazation due to Dto definition changed
symbol · Jun 5, 2019 · c724c95 · c724c95
2 parents 9a4cd82 + 1f9669f
commit c724c95
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/infrastructure/transaction/SerializeTransactionToJSON.ts b/src/infrastructure/transaction/SerializeTransactionToJSON.ts
@@ -43,11 +43,11 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
         case TransactionType.LINK_ACCOUNT:
             return {
                 remoteAccountKey: (transaction as AccountLinkTransaction).remoteAccountKey,
-                linkAction: (transaction as AccountLinkTransaction).linkAction,
+                action: (transaction as AccountLinkTransaction).linkAction,
             };
         case TransactionType.ADDRESS_ALIAS:
             return {
-                aliasAction: (transaction as AddressAliasTransaction).actionType,
+                action: (transaction as AddressAliasTransaction).actionType,
                 namespaceId: (transaction as AddressAliasTransaction).namespaceId.toDTO(),
                 address: (transaction as AddressAliasTransaction).address.toDTO(),
             };
@@ -101,7 +101,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
             };
         case TransactionType.MOSAIC_ALIAS:
             return {
-                aliasAction: (transaction as MosaicAliasTransaction).actionType,
+                action: (transaction as MosaicAliasTransaction).actionType,
                 namespaceId: (transaction as MosaicAliasTransaction).namespaceId.toDTO(),
                 mosaicId: (transaction as MosaicAliasTransaction).mosaicId.toDTO(),
             };

diff --git a/src/model/transaction/AccountPropertyModification.ts b/src/model/transaction/AccountPropertyModification.ts
@@ -76,7 +76,7 @@ export class AccountPropertyModification<T> {
     toDTO() {
         return {
             value: this.value,
-            modificationType: this.modificationType,
+            type: this.modificationType,
         };
     }
 }
diff --git a/test/infrastructure/SerializeTransactionToJSON.spec.ts b/test/infrastructure/SerializeTransactionToJSON.spec.ts
@@ -72,7 +72,7 @@ describe('SerializeTransactionToJSON', () => {
         const json = accountLinkTransaction.toJSON();
 
         expect(json.transaction.remoteAccountKey).to.be.equal(account.publicKey);
-        expect(json.transaction.linkAction).to.be.equal(LinkAction.Link);
+        expect(json.transaction.action).to.be.equal(LinkAction.Link);
     });
 
     it('should create AccountPropertyAddressTransaction', () => {
@@ -149,7 +149,7 @@ describe('SerializeTransactionToJSON', () => {
         const json = addressAliasTransaction.toJSON();
 
         expect(json.transaction.type).to.be.equal(TransactionType.ADDRESS_ALIAS);
-        expect(json.transaction.aliasAction).to.be.equal(AliasActionType.Link);
+        expect(json.transaction.action).to.be.equal(AliasActionType.Link);
     });
 
     it('should create MosaicAliasTransaction', () => {
@@ -165,7 +165,7 @@ describe('SerializeTransactionToJSON', () => {
         const json = mosaicAliasTransaction.toJSON();
 
         expect(json.transaction.type).to.be.equal(TransactionType.MOSAIC_ALIAS);
-        expect(json.transaction.aliasAction).to.be.equal(AliasActionType.Link);
+        expect(json.transaction.action).to.be.equal(AliasActionType.Link);
 
     });