PR feedbacks

Author: rg911

src/infrastructure/BlockHttp.ts

@@ -21,7 +21,6 @@ import { Address } from '../model/account/Address';
 import { PublicAccount } from '../model/account/PublicAccount';
 import { BlockInfo } from '../model/blockchain/BlockInfo';
 import { BlockType } from '../model/blockchain/BlockType';
-import { ImportanceBlockFooter } from '../model/blockchain/ImportanceBlockFooter';
 import { MerklePathItem } from '../model/blockchain/MerklePathItem';
 import { MerkleProofInfo } from '../model/blockchain/MerkleProofInfo';
 import { NemesisImportanceBlockInfo } from '../model/blockchain/NemesisImportanceBlockInfo';
@@ -125,21 +124,12 @@ export class BlockHttp extends Http implements BlockRepository {
             return normalBlock;
         } else if ([BlockType.ImportanceBlock.valueOf(), BlockType.NemesisBlock.valueOf()].includes(blockType)) {
             const importanceBlockInfoDto = dto.block as ImportanceBlockDTO;
-            const importanceBlockFooter = new ImportanceBlockFooter(
-                importanceBlockInfoDto.votingEligibleAccountsCount,
-                UInt64.fromNumericString(importanceBlockInfoDto.harvestingEligibleAccountsCount),
-                UInt64.fromNumericString(importanceBlockInfoDto.totalVotingBalance),
-                importanceBlockInfoDto.previousImportanceBlockHash,
-            );
-            return Object.assign(
-                {
-                    __proto__: Object.getPrototypeOf(normalBlock),
-                },
-                normalBlock,
-                {
-                    importanceBlockFooter,
-                },
-            ) as NemesisImportanceBlockInfo;
+            return DtoMapping.assign(normalBlock, {
+                votingEligibleAccountsCount: importanceBlockInfoDto.votingEligibleAccountsCount,
+                harvestingEligibleAccountsCount: UInt64.fromNumericString(importanceBlockInfoDto.harvestingEligibleAccountsCount),
+                totalVotingBalance: UInt64.fromNumericString(importanceBlockInfoDto.totalVotingBalance),
+                previousImportanceBlockHash: importanceBlockInfoDto.previousImportanceBlockHash,
+            }) as NemesisImportanceBlockInfo;
         } else {
             throw new Error(`Block type: ${blockType} invalid.`);
         }

src/model/blockchain/ImportanceBlockFooter.ts

@@ -14,7 +14,12 @@
  * limitations under the License.
  */
 
-import { ImportanceBlockFooter } from './ImportanceBlockFooter';
+import { UInt64 } from '../UInt64';
 import { NormalBlockInfo } from './NomalBlockInfo';
 
-export type NemesisImportanceBlockInfo = NormalBlockInfo & { importanceBlockFooter: ImportanceBlockFooter };
+export type NemesisImportanceBlockInfo = NormalBlockInfo & {
+    votingEligibleAccountsCount: number;
+    harvestingEligibleAccountsCount: UInt64;
+    totalVotingBalance: UInt64;
+    previousImportanceBlockHash: string;
+};

src/model/blockchain/NemesisImportanceBlockInfo.ts

@@ -4,7 +4,6 @@ export * from './BlockInfo';
 export * from './BlockType';
 export * from './ChainInfo';
 export * from './FinalizedBlock';
-export * from './ImportanceBlockFooter';
 export * from './MerklePathItem';
 export * from './MerklePosition';
 export * from './MerkleProofInfo';

src/model/blockchain/index.ts

@@ -127,16 +127,16 @@ describe('BlockHttp', () => {
         expect(blockInfo.totalFee.toString()).to.be.equals(blockInfoDto.meta.totalFee);
 
         if (isImportance) {
-            expect((blockInfo as NemesisImportanceBlockInfo).importanceBlockFooter.harvestingEligibleAccountsCount.toString()).to.be.equals(
+            expect((blockInfo as NemesisImportanceBlockInfo).harvestingEligibleAccountsCount.toString()).to.be.equals(
                 (importanceBlockInfoDto.block as ImportanceBlockDTO).harvestingEligibleAccountsCount,
             );
-            expect((blockInfo as NemesisImportanceBlockInfo).importanceBlockFooter.previousImportanceBlockHash).to.be.equals(
+            expect((blockInfo as NemesisImportanceBlockInfo).previousImportanceBlockHash).to.be.equals(
                 (importanceBlockInfoDto.block as ImportanceBlockDTO).previousImportanceBlockHash,
             );
-            expect((blockInfo as NemesisImportanceBlockInfo).importanceBlockFooter.totalVotingBalance.toString()).to.be.equals(
+            expect((blockInfo as NemesisImportanceBlockInfo).totalVotingBalance.toString()).to.be.equals(
                 (importanceBlockInfoDto.block as ImportanceBlockDTO).totalVotingBalance,
             );
-            expect((blockInfo as NemesisImportanceBlockInfo).importanceBlockFooter.votingEligibleAccountsCount).to.be.equals(
+            expect((blockInfo as NemesisImportanceBlockInfo).votingEligibleAccountsCount).to.be.equals(
                 (importanceBlockInfoDto.block as ImportanceBlockDTO).votingEligibleAccountsCount,
             );
         }

test/infrastructure/BlockHttp.spec.ts

@@ -16,6 +16,7 @@
 
 import { deepEqual } from 'assert';
 import { expect } from 'chai';
+import { BlockType } from '../../../src';
 import { Address } from '../../../src/model/account/Address';
 import { PublicAccount } from '../../../src/model/account/PublicAccount';
 import { NormalBlockInfo } from '../../../src/model/blockchain/NomalBlockInfo';
@@ -43,7 +44,7 @@ describe('BlockInfo', () => {
                 signerPublicKey: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
                 beneficiaryAddress: '7826D27E1D0A26CA4E316F901E23E55C8711DB20DF5C49B5',
                 timestamp: new UInt64([0, 0]),
-                type: 33091,
+                type: BlockType.NormalBlock,
                 version: 1,
                 network: 144,
             },