Merge remote-tracking branch 'ArkEcosystem/core/develop' into blockid

* ArkEcosystem/core/develop: fix(core-tester-cli): Fix the description of debug:serialize test: remove integration setup & tests from unit tests (#2194)
ArkEcosystem · Mar 8, 2019 · fee99c3 · fee99c3
2 parents 2466311 + 183eab1
commit fee99c3
Show file tree

Hide file tree

Showing 98 changed files with 1,192 additions and 1,381 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/__tests__/integration/core-api/v2/handlers/delegates.test.ts b/__tests__/integration/core-api/v2/handlers/delegates.test.ts
@@ -25,7 +25,7 @@ const delegate = {
 
 const delegate2 = {
     username: "genesis_11",
-}
+};
 
 beforeAll(async () => {
     await setUp();
@@ -217,7 +217,7 @@ describe("API 2.0 - Delegates", () => {
             (header, request) => {
                 it("should POST a search for delegates with an address that matches the given string", async () => {
                     const response = await utils[request]("POST", "delegates/search", {
-                        address: delegate.address
+                        address: delegate.address,
                     });
 
                     expect(response).toBeSuccessfulResponse();
@@ -232,7 +232,7 @@ describe("API 2.0 - Delegates", () => {
 
                 it("should POST a search for delegates with a public key that matches the given string", async () => {
                     const response = await utils[request]("POST", "delegates/search", {
-                        publicKey: delegate.publicKey
+                        publicKey: delegate.publicKey,
                     });
 
                     expect(response).toBeSuccessfulResponse();
@@ -247,7 +247,7 @@ describe("API 2.0 - Delegates", () => {
 
                 it("should POST a search for delegates with a username that matches the given string", async () => {
                     const response = await utils[request]("POST", "delegates/search", {
-                        username: delegate.username
+                        username: delegate.username,
                     });
 
                     expect(response).toBeSuccessfulResponse();
@@ -261,10 +261,10 @@ describe("API 2.0 - Delegates", () => {
                 });
 
                 it("should POST a search for delegates with any of the specified usernames", async () => {
-                    const usernames = [delegate.username, delegate2.username]
+                    const usernames = [delegate.username, delegate2.username];
 
                     const response = await utils[request]("POST", "delegates/search", {
-                        usernames
+                        usernames,
                     });
 
                     expect(response).toBeSuccessfulResponse();
@@ -310,7 +310,7 @@ describe("API 2.0 - Delegates", () => {
                     for (const elem of response.data.data) {
                         utils.expectDelegate(elem);
                         expect(elem.production.approval).toBeGreaterThanOrEqual(1);
-                        expect(elem.production.approval).toBeLessThanOrEqual(100)
+                        expect(elem.production.approval).toBeLessThanOrEqual(100);
                     }
                 });
 
@@ -328,7 +328,7 @@ describe("API 2.0 - Delegates", () => {
 
                     for (const elem of response.data.data) {
                         utils.expectDelegate(elem);
-                        expect(elem.forged.fees).toEqual(delegate.forgedFees)
+                        expect(elem.forged.fees).toEqual(delegate.forgedFees);
                     }
                 });
 
@@ -347,7 +347,7 @@ describe("API 2.0 - Delegates", () => {
                     for (const elem of response.data.data) {
                         utils.expectDelegate(elem);
                         expect(elem.forged.fees).toBeGreaterThanOrEqual(0);
-                        expect(elem.forged.fees).toBeLessThanOrEqual(delegate.forgedFees)
+                        expect(elem.forged.fees).toBeLessThanOrEqual(delegate.forgedFees);
                     }
                 });
 
@@ -365,7 +365,7 @@ describe("API 2.0 - Delegates", () => {
 
                     for (const elem of response.data.data) {
                         utils.expectDelegate(elem);
-                        expect(elem.forged.rewards).toEqual(delegate.forgedRewards)
+                        expect(elem.forged.rewards).toEqual(delegate.forgedRewards);
                     }
                 });
 
@@ -384,7 +384,7 @@ describe("API 2.0 - Delegates", () => {
                     for (const elem of response.data.data) {
                         utils.expectDelegate(elem);
                         expect(elem.forged.rewards).toBeGreaterThanOrEqual(0);
-                        expect(elem.forged.rewards).toBeLessThanOrEqual(delegate.forgedRewards)
+                        expect(elem.forged.rewards).toBeLessThanOrEqual(delegate.forgedRewards);
                     }
                 });
 
@@ -402,7 +402,7 @@ describe("API 2.0 - Delegates", () => {
 
                     for (const elem of response.data.data) {
                         utils.expectDelegate(elem);
-                        expect(elem.forged.total).toEqual(delegate.forgedTotal)
+                        expect(elem.forged.total).toEqual(delegate.forgedTotal);
                     }
                 });
 
@@ -421,7 +421,7 @@ describe("API 2.0 - Delegates", () => {
                     for (const elem of response.data.data) {
                         utils.expectDelegate(elem);
                         expect(elem.forged.total).toBeGreaterThanOrEqual(0);
-                        expect(elem.forged.total).toBeLessThanOrEqual(delegate.forgedTotal)
+                        expect(elem.forged.total).toBeLessThanOrEqual(delegate.forgedTotal);
                     }
                 });
 
@@ -439,7 +439,7 @@ describe("API 2.0 - Delegates", () => {
 
                     for (const elem of response.data.data) {
                         utils.expectDelegate(elem);
-                        expect(elem.blocks.produced).toEqual(delegate.producedBlocks)
+                        expect(elem.blocks.produced).toEqual(delegate.producedBlocks);
                     }
                 });
 
@@ -458,7 +458,7 @@ describe("API 2.0 - Delegates", () => {
                     for (const elem of response.data.data) {
                         utils.expectDelegate(elem);
                         expect(elem.blocks.produced).toBeGreaterThanOrEqual(0);
-                        expect(elem.blocks.produced).toBeLessThanOrEqual(delegate.producedBlocks)
+                        expect(elem.blocks.produced).toBeLessThanOrEqual(delegate.producedBlocks);
                     }
                 });
 
@@ -476,7 +476,7 @@ describe("API 2.0 - Delegates", () => {
 
                     for (const elem of response.data.data) {
                         utils.expectDelegate(elem);
-                        expect(elem.blocks.missed).toEqual(delegate.missedBlocks)
+                        expect(elem.blocks.missed).toEqual(delegate.missedBlocks);
                     }
                 });
 
@@ -495,7 +495,7 @@ describe("API 2.0 - Delegates", () => {
                     for (const elem of response.data.data) {
                         utils.expectDelegate(elem);
                         expect(elem.blocks.missed).toBeGreaterThanOrEqual(0);
-                        expect(elem.blocks.missed).toBeLessThanOrEqual(delegate.missedBlocks)
+                        expect(elem.blocks.missed).toBeLessThanOrEqual(delegate.missedBlocks);
                     }
                 });
 
@@ -513,7 +513,7 @@ describe("API 2.0 - Delegates", () => {
 
                     for (const elem of response.data.data) {
                         utils.expectDelegate(elem);
-                        expect(elem.production.productivity).toEqual(delegate.productivity)
+                        expect(elem.production.productivity).toEqual(delegate.productivity);
                     }
                 });
 
@@ -532,7 +532,7 @@ describe("API 2.0 - Delegates", () => {
                     for (const elem of response.data.data) {
                         utils.expectDelegate(elem);
                         expect(elem.production.productivity).toBeGreaterThanOrEqual(0);
-                        expect(elem.production.productivity).toBeLessThanOrEqual(delegate.productivity)
+                        expect(elem.production.productivity).toBeLessThanOrEqual(delegate.productivity);
                     }
                 });
 
@@ -550,7 +550,7 @@ describe("API 2.0 - Delegates", () => {
 
                     for (const elem of response.data.data) {
                         utils.expectDelegate(elem);
-                        expect(elem.votes).toEqual(delegate.voteBalance)
+                        expect(elem.votes).toEqual(delegate.voteBalance);
                     }
                 });
 
@@ -569,7 +569,7 @@ describe("API 2.0 - Delegates", () => {
                     for (const elem of response.data.data) {
                         utils.expectDelegate(elem);
                         expect(elem.votes).toBeGreaterThanOrEqual(0);
-                        expect(elem.votes).toBeLessThanOrEqual(delegate.voteBalance)
+                        expect(elem.votes).toBeLessThanOrEqual(delegate.voteBalance);
                     }
                 });
             },

diff --git a/...re-database-postgres/__support__/setup.ts → ...re-database-postgres/__support__/setup.ts b/...re-database-postgres/__support__/setup.ts → ...re-database-postgres/__support__/setup.ts
diff --git a/...core-database-postgres/connection.test.ts → ...core-database-postgres/connection.test.ts b/...core-database-postgres/connection.test.ts → ...core-database-postgres/connection.test.ts
diff --git a/__tests__/integration/core-forger/__fixtures__/block.ts b/__tests__/integration/core-forger/__fixtures__/block.ts
@@ -0,0 +1,19 @@
+import { models } from "@arkecosystem/crypto";
+
+export const sampleBlock = new models.Block({
+    id: "4398082439836560423",
+    version: 0,
+    timestamp: 35751416,
+    height: 3342573,
+    previousBlock: "14909996519459393858",
+    numberOfTransactions: 0,
+    totalAmount: 0,
+    totalFee: 0,
+    reward: 200000000,
+    payloadLength: 0,
+    payloadHash: "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+    generatorPublicKey: "03806036bc1bb470144184b10f815431c580ae2b806d5fd0ba2118dca823c5c4a6",
+    blockSignature:
+        // tslint:disable-next-line:max-line-length
+        "3045022100d0ad616575b1039b89ae22bb8efbce80dd14f52d193ef7a1d0a76fab0253aa4f02206a347bb5d4dc372e5a7ad3f16ae44409d9190fbd8138e9b4e99f83ca3236f91d",
+});
diff --git a/__tests__/unit/core-forger/client.test.ts → ...__/integration/core-forger/client.test.ts b/__tests__/unit/core-forger/client.test.ts → ...__/integration/core-forger/client.test.ts
@@ -1,11 +1,12 @@
+import "./mocks/core-container";
+
 import "jest-extended";
 
 import { NetworkState, NetworkStateStatus } from "@arkecosystem/core-p2p";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import { Client } from "../../../packages/core-forger/src/client";
 import { sampleBlock } from "./__fixtures__/block";
-import { setUp, tearDown } from "./__support__/setup";
 
 const mockAxios = new MockAdapter(axios);
 
@@ -15,12 +16,7 @@ const host = `http://127.0.0.1:4000`;
 
 let client: Client;
 
-beforeAll(async () => {
-    await setUp();
-});
-
 afterAll(async () => {
-    await tearDown();
     mockAxios.restore();
 });
 

diff --git a/__tests__/integration/core-forger/mocks/core-container.ts b/__tests__/integration/core-forger/mocks/core-container.ts
@@ -0,0 +1,24 @@
+jest.mock("@arkecosystem/core-container", () => {
+    return {
+        app: {
+            getConfig: () => {
+                return {
+                    get: () => ({}),
+                };
+            },
+            getVersion: () => "2.3.0",
+            resolvePlugin: name => {
+                if (name === "logger") {
+                    return {
+                        info: jest.fn(),
+                        warn: jest.fn(),
+                        error: jest.fn(),
+                        debug: jest.fn(),
+                    };
+                }
+
+                return {};
+            },
+        },
+    };
+});
diff --git a/...t/core-tester-cli/__fixtures__/block.json → ...n/core-tester-cli/__fixtures__/block.json b/...t/core-tester-cli/__fixtures__/block.json → ...n/core-tester-cli/__fixtures__/block.json
diff --git a/...er-cli/__fixtures__/delegates-page-1.json → ...er-cli/__fixtures__/delegates-page-1.json b/...er-cli/__fixtures__/delegates-page-1.json → ...er-cli/__fixtures__/delegates-page-1.json
diff --git a/...er-cli/__fixtures__/delegates-page-2.json → ...er-cli/__fixtures__/delegates-page-2.json b/...er-cli/__fixtures__/delegates-page-2.json → ...er-cli/__fixtures__/delegates-page-2.json
diff --git a/...e-tester-cli/__fixtures__/identities.json → ...e-tester-cli/__fixtures__/identities.json b/...e-tester-cli/__fixtures__/identities.json → ...e-tester-cli/__fixtures__/identities.json
diff --git a/...ester-cli/__fixtures__/transaction-1.json → ...ester-cli/__fixtures__/transaction-1.json b/...ester-cli/__fixtures__/transaction-1.json → ...ester-cli/__fixtures__/transaction-1.json
diff --git a/.../__fixtures__/transaction-response-1.json → .../__fixtures__/transaction-response-1.json b/.../__fixtures__/transaction-response-1.json → .../__fixtures__/transaction-response-1.json
diff --git a/...-cli/__fixtures__/transaction-second.json → ...-cli/__fixtures__/transaction-second.json b/...-cli/__fixtures__/transaction-second.json → ...-cli/__fixtures__/transaction-second.json
diff --git a/...-tester-cli/__fixtures__/transaction.json → ...-tester-cli/__fixtures__/transaction.json b/...-tester-cli/__fixtures__/transaction.json → ...-tester-cli/__fixtures__/transaction.json
diff --git a/...ester-cli/__fixtures__/voters-page-1.json → ...ester-cli/__fixtures__/voters-page-1.json b/...ester-cli/__fixtures__/voters-page-1.json → ...ester-cli/__fixtures__/voters-page-1.json
diff --git a/...ester-cli/__fixtures__/voters-page-2.json → ...ester-cli/__fixtures__/voters-page-2.json b/...ester-cli/__fixtures__/voters-page-2.json → ...ester-cli/__fixtures__/voters-page-2.json
diff --git a/...ore-tester-cli/__fixtures__/wallet-1.json → ...ore-tester-cli/__fixtures__/wallet-1.json b/...ore-tester-cli/__fixtures__/wallet-1.json → ...ore-tester-cli/__fixtures__/wallet-1.json
diff --git a/...er-cli/commands/debug/deserialize.test.ts → ...er-cli/commands/debug/deserialize.test.ts b/...er-cli/commands/debug/deserialize.test.ts → ...er-cli/commands/debug/deserialize.test.ts
diff --git a/...ester-cli/commands/debug/identity.test.ts → ...ester-cli/commands/debug/identity.test.ts b/...ester-cli/commands/debug/identity.test.ts → ...ester-cli/commands/debug/identity.test.ts
diff --git a/...ster-cli/commands/debug/serialize.test.ts → ...ster-cli/commands/debug/serialize.test.ts b/...ster-cli/commands/debug/serialize.test.ts → ...ster-cli/commands/debug/serialize.test.ts
diff --git a/...-cli/commands/debug/verify-second.test.ts → ...-cli/commands/debug/verify-second.test.ts b/...-cli/commands/debug/verify-second.test.ts → ...-cli/commands/debug/verify-second.test.ts
diff --git a/...-tester-cli/commands/debug/verify.test.ts → ...-tester-cli/commands/debug/verify.test.ts b/...-tester-cli/commands/debug/verify.test.ts → ...-tester-cli/commands/debug/verify.test.ts
diff --git a/...mmands/send/delegate-registration.test.ts → ...mmands/send/delegate-registration.test.ts b/...mmands/send/delegate-registration.test.ts → ...mmands/send/delegate-registration.test.ts
diff --git a/...li/commands/send/second-signature.test.ts → ...li/commands/send/second-signature.test.ts b/...li/commands/send/second-signature.test.ts → ...li/commands/send/second-signature.test.ts
diff --git a/...tester-cli/commands/send/transfer.test.ts → ...tester-cli/commands/send/transfer.test.ts b/...tester-cli/commands/send/transfer.test.ts → ...tester-cli/commands/send/transfer.test.ts
diff --git a/...ore-tester-cli/commands/send/vote.test.ts → ...ore-tester-cli/commands/send/vote.test.ts b/...ore-tester-cli/commands/send/vote.test.ts → ...ore-tester-cli/commands/send/vote.test.ts
diff --git a/__tests__/unit/core-tester-cli/shared.ts → ...s__/integration/core-tester-cli/shared.ts b/__tests__/unit/core-tester-cli/shared.ts → ...s__/integration/core-tester-cli/shared.ts
diff --git a/...nit/core-vote-report/__support__/setup.ts → ...ion/core-vote-report/__support__/setup.ts b/...nit/core-vote-report/__support__/setup.ts → ...ion/core-vote-report/__support__/setup.ts
diff --git a/...ts__/unit/core-vote-report/server.test.ts → ...tegration/core-vote-report/server.test.ts b/...ts__/unit/core-vote-report/server.test.ts → ...tegration/core-vote-report/server.test.ts
diff --git a/..._/unit/core-webhooks/__support__/setup.ts → ...ration/core-webhooks/__support__/setup.ts b/..._/unit/core-webhooks/__support__/setup.ts → ...ration/core-webhooks/__support__/setup.ts
diff --git a/..._/unit/core-webhooks/__support__/utils.ts → ...ration/core-webhooks/__support__/utils.ts b/..._/unit/core-webhooks/__support__/utils.ts → ...ration/core-webhooks/__support__/utils.ts
diff --git a/__tests__/unit/core-webhooks/server.test.ts → .../integration/core-webhooks/server.test.ts b/__tests__/unit/core-webhooks/server.test.ts → .../integration/core-webhooks/server.test.ts
diff --git a/__tests__/unit/core-api/__support__/setup.ts b/__tests__/unit/core-api/__support__/setup.ts
diff --git a/__tests__/unit/core-api/__support__/utils/generate-round.ts b/__tests__/unit/core-api/__support__/utils/generate-round.ts
diff --git a/__tests__/unit/core-blockchain/__support__/setup.ts b/__tests__/unit/core-blockchain/__support__/setup.ts