Fixed a few merge issues

Author: rg911

src/model/transaction/Transaction.ts

@@ -211,7 +211,7 @@ export abstract class Transaction {
         const commonTransactionObject = {
             type: this.type,
             networkType: this.networkType,
-            version: this.version,
+            version: this.versionToDTO(),
             maxFee: this.maxFee.toDTO(),
             deadline: this.deadline.toDTO(),
             signature: this.signature ? this.signature : '',

test/core/utils/TransactionMapping.spec.ts

@@ -219,7 +219,6 @@ describe('TransactionMapping - createFromPayload', () => {
 
         const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as MosaicDefinitionTransaction;
 
-        expect(transaction.mosaicProperties.duration! .higher).to.be.equal(0);
         expect(transaction.mosaicProperties.divisibility).to.be.equal(3);
         expect(transaction.mosaicProperties.supplyMutable).to.be.equal(false);
         expect(transaction.mosaicProperties.transferable).to.be.equal(false);

test/infrastructure/SerializeTransactionToJSON.spec.ts

@@ -213,59 +213,8 @@ describe('SerializeTransactionToJSON', () => {
 
         const json = mosaicDefinitionTransaction.toJSON();
 
-        expect(json.type).to.be.equal(TransactionType.MOSAIC_DEFINITION);
-        expect(json.mosaicProperties.supplyMutable).to.be.equal(false);
-        expect(json.mosaicProperties.transferable).to.be.equal(false);
-        expect(json.mosaicProperties.levyMutable).to.be.equal(false);
-        expect(json.mosaicProperties.divisibility).to.be.equal(3);
-
-    });
-
-    it('should create MosaicDefinitionTransaction without duration', () => {
-        const mosaicDefinitionTransaction = MosaicDefinitionTransaction.create(
-            Deadline.create(),
-            new MosaicNonce(new Uint8Array([0xE6, 0xDE, 0x84, 0xB8])), // nonce
-            new MosaicId(UInt64.fromUint(1).toDTO()), // ID
-            MosaicProperties.create({
-                supplyMutable: false,
-                transferable: false,
-                levyMutable: false,
-                divisibility: 3,
-            }),
-            NetworkType.MIJIN_TEST,
-        );
-
-        const json = mosaicDefinitionTransaction.toJSON();
-
-        expect(json.type).to.be.equal(TransactionType.MOSAIC_DEFINITION);
-        expect(json.mosaicProperties.supplyMutable).to.be.equal(false);
-        expect(json.mosaicProperties.transferable).to.be.equal(false);
-        expect(json.mosaicProperties.levyMutable).to.be.equal(false);
-        expect(json.mosaicProperties.divisibility).to.be.equal(3);
-
-    });
-
-    it('should create MosaicDefinitionTransaction without duration', () => {
-        const mosaicDefinitionTransaction = MosaicDefinitionTransaction.create(
-            Deadline.create(),
-            new MosaicNonce(new Uint8Array([0xE6, 0xDE, 0x84, 0xB8])), // nonce
-            new MosaicId(UInt64.fromUint(1).toDTO()), // ID
-            MosaicProperties.create({
-                supplyMutable: false,
-                transferable: false,
-                levyMutable: false,
-                divisibility: 3,
-            }),
-            NetworkType.MIJIN_TEST,
-        );
-
-        const json = mosaicDefinitionTransaction.toJSON();
-
-        expect(json.type).to.be.equal(TransactionType.MOSAIC_DEFINITION);
-        expect(json.mosaicProperties.supplyMutable).to.be.equal(false);
-        expect(json.mosaicProperties.transferable).to.be.equal(false);
-        expect(json.mosaicProperties.levyMutable).to.be.equal(false);
-        expect(json.mosaicProperties.divisibility).to.be.equal(3);
+        expect(json.transaction.type).to.be.equal(TransactionType.MOSAIC_DEFINITION);
+        expect(json.transaction.properties.length).to.be.equal(2);
 
     });