Fixed receipt serializer and updated block e2e test

Author: rg911

e2e/infrastructure/BlockHttp.spec.ts

@@ -15,6 +15,7 @@
  */
 
 import {assert, expect} from 'chai';
+import { mergeMap } from 'rxjs/operators';
 import {BlockHttp} from '../../src/infrastructure/BlockHttp';
 import { Listener, ReceiptHttp, TransactionHttp } from '../../src/infrastructure/infrastructure';
 import {QueryParams} from '../../src/infrastructure/QueryParams';
@@ -24,6 +25,7 @@ import { PlainMessage } from '../../src/model/message/PlainMessage';
 import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic';
 import { Deadline } from '../../src/model/transaction/Deadline';
 import { Transaction } from '../../src/model/transaction/Transaction';
+import { TransactionInfo } from '../../src/model/transaction/TransactionInfo';
 import { TransferTransaction } from '../../src/model/transaction/TransferTransaction';
 
 describe('BlockHttp', () => {
@@ -144,17 +146,28 @@ describe('BlockHttp', () => {
     });
     describe('getMerkleReceipts', () => {
         it('should return Merkle Receipts', (done) => {
-            receiptHttp.getMerkleReceipts(chainHeight, blockReceiptHash)
-                .subscribe((merkleReceipts) => {
-                    expect(merkleReceipts.merklePath).not.to.be.null;
-                    done();
-                });
+            receiptHttp.getBlockReceipts(chainHeight).pipe(
+                mergeMap((_) => {
+                    return receiptHttp.getMerkleReceipts(chainHeight, _.transactionStatements[0].generateHash());
+                }))
+            .subscribe((merkleReceipts) => {
+                expect(merkleReceipts.merklePath).not.to.be.null;
+                done();
+            });
         });
     });
     describe('getMerkleTransaction', () => {
         it('should return Merkle Transaction', (done) => {
-            blockHttp.getMerkleTransaction(chainHeight, blockTransactionHash)
-                .subscribe((merkleTransactionss) => {
+            blockHttp.getBlockTransactions(chainHeight).pipe(
+                mergeMap((_) => {
+                    const hash = (_[0].transactionInfo as TransactionInfo).hash;
+                    if (hash) {
+                        return blockHttp.getMerkleTransaction(chainHeight, hash);
+                    }
+                    // If reaching this line, something is not right
+                    throw new Error('Tansacation hash is undefined');
+                }))
+            .subscribe((merkleTransactionss) => {
                     expect(merkleTransactionss.merklePath).not.to.be.null;
                     done();
                 });

src/model/receipt/BalanceChangeReceipt.ts

@@ -65,9 +65,9 @@ export class BalanceChangeReceipt extends Receipt {
         const buffer = new Uint8Array(52);
         buffer.set(GeneratorUtils.uintToBuffer(ReceiptVersion.BALANCE_CHANGE, 2));
         buffer.set(GeneratorUtils.uintToBuffer(this.type, 2), 2);
-        buffer.set(Convert.hexToUint8(this.targetPublicAccount.publicKey), 4);
-        buffer.set(GeneratorUtils.uint64ToBuffer(UInt64.fromHex(this.mosaicId.toHex()).toDTO()), 36);
-        buffer.set(GeneratorUtils.uint64ToBuffer(UInt64.fromHex(this.amount.toHex()).toDTO()), 44);
+        buffer.set(GeneratorUtils.uint64ToBuffer(UInt64.fromHex(this.mosaicId.toHex()).toDTO()), 4);
+        buffer.set(GeneratorUtils.uint64ToBuffer(UInt64.fromHex(this.amount.toHex()).toDTO()), 12);
+        buffer.set(Convert.hexToUint8(this.targetPublicAccount.publicKey), 20);
         return buffer;
     }
 }

src/model/receipt/BalanceTransferReceipt.ts

@@ -74,10 +74,10 @@ export class BalanceTransferReceipt extends Receipt {
         const buffer = new Uint8Array(52 + recipient.length);
         buffer.set(GeneratorUtils.uintToBuffer(ReceiptVersion.BALANCE_TRANSFER, 2));
         buffer.set(GeneratorUtils.uintToBuffer(this.type, 2), 2);
-        buffer.set(Convert.hexToUint8(this.sender.publicKey), 4);
-        buffer.set(recipient, 36);
-        buffer.set(GeneratorUtils.uint64ToBuffer(UInt64.fromHex(this.mosaicId.toHex()).toDTO()), 36 + recipient.length);
-        buffer.set(GeneratorUtils.uint64ToBuffer(UInt64.fromHex(this.amount.toHex()).toDTO()), 44 + recipient.length);
+        buffer.set(GeneratorUtils.uint64ToBuffer(UInt64.fromHex(this.mosaicId.toHex()).toDTO()), 4);
+        buffer.set(GeneratorUtils.uint64ToBuffer(UInt64.fromHex(this.amount.toHex()).toDTO()), 12);
+        buffer.set(Convert.hexToUint8(this.sender.publicKey), 20);
+        buffer.set(recipient, 52);
         return buffer;
     }