From 5a82211f0f701ecd96b4fb05758535dea440e698 Mon Sep 17 00:00:00 2001
From: Brian Faust <hello@basecode.sh>
Date: Wed, 27 Nov 2019 08:42:24 +0200
Subject: [PATCH] refactor(core-test-framework): create a real block via block
 factory

---
 .../factories/factories/block.test.ts         | 55 +++++++------------
 .../src/factories/factories/block.ts          |  5 +-
 2 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/__tests__/unit/core-test-framework/factories/factories/block.test.ts b/__tests__/unit/core-test-framework/factories/factories/block.test.ts
index c9f6cc776a..e772ec178e 100644
--- a/__tests__/unit/core-test-framework/factories/factories/block.test.ts
+++ b/__tests__/unit/core-test-framework/factories/factories/block.test.ts
@@ -1,7 +1,8 @@
 import "jest-extended";
 
+import { Utils } from "@arkecosystem/core-kernel";
+import { Blocks } from "@arkecosystem/crypto";
 import { FactoryBuilder, Factories } from "@packages/core-test-framework/src/factories";
-import { Interfaces } from "@arkecosystem/crypto";
 
 let factory: FactoryBuilder;
 
@@ -13,44 +14,26 @@ beforeEach(() => {
 
 describe("BlockFactory", () => {
     it("should create a single block", () => {
-        const entity: Interfaces.IBlockJson = factory.get("Block").make();
+        const entity: Blocks.Block = factory.get("Block").make();
 
-        expect(entity).toContainAllKeys([
-            "blockSignature",
-            "generatorPublicKey",
-            "height",
-            "id",
-            "idHex",
-            "numberOfTransactions",
-            "payloadHash",
-            "payloadLength",
-            "previousBlock",
-            "previousBlockHex",
-            "reward",
-            "serialized",
-            "timestamp",
-            "totalAmount",
-            "totalFee",
-            "transactions",
-            "version",
-        ]);
+        expect(entity).toBeInstanceOf(Blocks.Block);
+        expect(entity.data.blockSignature).toBeString();
+        expect(entity.data.generatorPublicKey).toBeString();
+        expect(entity.data.height).toBeNumber();
+        expect(entity.data.id).toBeString();
+        expect(entity.data.idHex).toBeString();
+        expect(entity.data.numberOfTransactions).toBeNumber();
+        expect(entity.data.payloadHash).toBeString();
+        expect(entity.data.payloadLength).toBeNumber();
+        expect(entity.data.previousBlock).toBeString();
+        expect(entity.data.previousBlockHex).toBeString();
+        expect(entity.data.reward).toBeInstanceOf(Utils.BigNumber);
+        expect(entity.data.timestamp).toBeNumber();
+        expect(entity.data.totalAmount).toBeInstanceOf(Utils.BigNumber);
+        expect(entity.data.totalFee).toBeInstanceOf(Utils.BigNumber);
+        expect(entity.data.version).toBeNumber();
 
-        expect(entity.blockSignature).toBeString();
-        expect(entity.generatorPublicKey).toBeString();
-        expect(entity.height).toBeNumber();
-        expect(entity.id).toBeString();
-        expect(entity.idHex).toBeString();
-        expect(entity.numberOfTransactions).toBeNumber();
-        expect(entity.payloadHash).toBeString();
-        expect(entity.payloadLength).toBeNumber();
-        expect(entity.previousBlock).toBeString();
-        expect(entity.previousBlockHex).toBeString();
-        expect(entity.reward).toBeString();
         expect(entity.serialized).toBeString();
-        expect(entity.timestamp).toBeNumber();
-        expect(entity.totalAmount).toBeString();
-        expect(entity.totalFee).toBeString();
         expect(entity.transactions).toBeArray();
-        expect(entity.version).toBeNumber();
     });
 });
diff --git a/packages/core-test-framework/src/factories/factories/block.ts b/packages/core-test-framework/src/factories/factories/block.ts
index f16d7f9f21..29991125cd 100644
--- a/packages/core-test-framework/src/factories/factories/block.ts
+++ b/packages/core-test-framework/src/factories/factories/block.ts
@@ -10,13 +10,10 @@ export const registerBlockFactory = (factory: FactoryBuilder): void => {
 
         const { blocktime, reward } = Managers.configManager.getMilestone(previousBlock.height);
 
-        // todo: support transactions via factory calls
-        const newBlock = DelegateFactory.fromBIP39(options.passphrase || secrets[0]).forge([], {
+        return DelegateFactory.fromBIP39(options.passphrase || secrets[0]).forge(options.transactions || [], {
             previousBlock,
             timestamp: Crypto.Slots.getSlotNumber(Crypto.Slots.getTime()) * options.blocktime || blocktime,
             reward: options.reward || reward,
         })!;
-
-        return { ...newBlock.toJson(), ...{ serialized: newBlock.serialized } };
     });
 };