refactor: remove missed blocks and productivity (#2257)

ArkEcosystem · Mar 18, 2019 · 0288158 · 0288158
1 parent 7a1ccd6
commit 0288158
Show file tree

Hide file tree

Showing 22 changed files with 15 additions and 289 deletions.
diff --git a/__tests__/integration/core-api/__support__/setup.ts b/__tests__/integration/core-api/__support__/setup.ts
@@ -54,7 +54,6 @@ async function calculateRanks() {
 
     sortBy(delegateWallets, "publicKey").forEach((delegate, i) => {
         const wallet = databaseService.walletManager.findByPublicKey(delegate.publicKey);
-        wallet.missedBlocks = +delegate.missedBlocks;
         (wallet as any).rate = i + 1;
 
         databaseService.walletManager.reindex(wallet);

diff --git a/__tests__/integration/core-api/v1/utils.ts b/__tests__/integration/core-api/v1/utils.ts
@@ -55,10 +55,8 @@ class Helpers {
         expect(delegate.publicKey).toBeString();
         expect(delegate.vote).toBeString();
         expect(delegate.rate).toBeNumber();
-        expect(delegate.missedblocks).toBeNumber();
         expect(delegate.producedblocks).toBeNumber();
         expect(delegate.approval).toBeNumber();
-        expect(delegate.productivity).toBeNumber();
 
         Object.keys(expected || {}).forEach(attr => {
             expect(delegate[attr]).toBe(expected[attr]);

diff --git a/__tests__/integration/core-api/v2/handlers/delegates.test.ts b/__tests__/integration/core-api/v2/handlers/delegates.test.ts
@@ -18,8 +18,6 @@ const delegate = {
     forgedRewards: 50,
     forgedTotal: 100,
     producedBlocks: 75,
-    missedBlocks: 25,
-    productivity: 75,
     voteBalance: 100000,
 };
 
@@ -36,7 +34,6 @@ beforeAll(async () => {
     wallet.forgedFees = new Bignum(delegate.forgedFees);
     wallet.forgedRewards = new Bignum(delegate.forgedRewards);
     wallet.producedBlocks = 75;
-    wallet.missedBlocks = 25;
     wallet.voteBalance = new Bignum(delegate.voteBalance);
     wm.reindex(wallet);
 });
@@ -103,22 +100,6 @@ describe("API 2.0 - Delegates", () => {
             },
         );
 
-        describe.each([["API-Version", "request"], ["Accept", "requestWithAcceptHeader"]])(
-            "using the %s header",
-            (header, request) => {
-                it("should GET all the delegates ordered by descending productivity", async () => {
-                    const response = await utils[request]("GET", "delegates", { orderBy: "productivity:desc" });
-                    expect(response).toBeSuccessfulResponse();
-                    expect(response.data.data).toBeArray();
-
-                    response.data.data.forEach(utils.expectDelegate);
-                    expect(
-                        response.data.data.sort((a, b) => a.production.productivity > b.production.productivity),
-                    ).toEqual(response.data.data);
-                });
-            },
-        );
-
         describe.each([["API-Version", "request"], ["Accept", "requestWithAcceptHeader"]])(
             "using the %s header",
             (header, request) => {
@@ -462,80 +443,6 @@ describe("API 2.0 - Delegates", () => {
                     }
                 });
 
-                it("should POST a search for delegates with the exact specified missed blocks", async () => {
-                    const response = await utils[request]("POST", "delegates/search", {
-                        missedBlocks: {
-                            from: delegate.missedBlocks,
-                            to: delegate.missedBlocks,
-                        },
-                    });
-
-                    expect(response).toBeSuccessfulResponse();
-                    expect(response.data.data).toBeArray();
-                    expect(response.data.data).toHaveLength(1);
-
-                    for (const elem of response.data.data) {
-                        utils.expectDelegate(elem);
-                        expect(elem.blocks.missed).toEqual(delegate.missedBlocks);
-                    }
-                });
-
-                it("should POST a search for delegates with the specified missed blocks range", async () => {
-                    const response = await utils[request]("POST", "delegates/search", {
-                        missedBlocks: {
-                            from: 0,
-                            to: delegate.missedBlocks,
-                        },
-                    });
-
-                    expect(response).toBeSuccessfulResponse();
-                    expect(response.data.data).toBeArray();
-                    expect(response.data.data).toHaveLength(51);
-
-                    for (const elem of response.data.data) {
-                        utils.expectDelegate(elem);
-                        expect(elem.blocks.missed).toBeGreaterThanOrEqual(0);
-                        expect(elem.blocks.missed).toBeLessThanOrEqual(delegate.missedBlocks);
-                    }
-                });
-
-                it("should POST a search for delegates with the exact specified productivity", async () => {
-                    const response = await utils[request]("POST", "delegates/search", {
-                        productivity: {
-                            from: delegate.productivity,
-                            to: delegate.productivity,
-                        },
-                    });
-
-                    expect(response).toBeSuccessfulResponse();
-                    expect(response.data.data).toBeArray();
-                    expect(response.data.data).toHaveLength(1);
-
-                    for (const elem of response.data.data) {
-                        utils.expectDelegate(elem);
-                        expect(elem.production.productivity).toEqual(delegate.productivity);
-                    }
-                });
-
-                it("should POST a search for delegates with the specified productivity range", async () => {
-                    const response = await utils[request]("POST", "delegates/search", {
-                        productivity: {
-                            from: 0,
-                            to: delegate.productivity,
-                        },
-                    });
-
-                    expect(response).toBeSuccessfulResponse();
-                    expect(response.data.data).toBeArray();
-                    expect(response.data.data).toHaveLength(51);
-
-                    for (const elem of response.data.data) {
-                        utils.expectDelegate(elem);
-                        expect(elem.production.productivity).toBeGreaterThanOrEqual(0);
-                        expect(elem.production.productivity).toBeLessThanOrEqual(delegate.productivity);
-                    }
-                });
-
                 it("should POST a search for delegates with the exact specified vote balance", async () => {
                     const response = await utils[request]("POST", "delegates/search", {
                         voteBalance: {

diff --git a/__tests__/integration/core-api/v2/utils.ts b/__tests__/integration/core-api/v2/utils.ts
@@ -121,11 +121,9 @@ class Helpers {
         expect(delegate.votes).toBeNumber();
         expect(delegate.rank).toBeNumber();
         expect(delegate.blocks).toBeObject();
-        expect(delegate.blocks.missed).toBeNumber();
         expect(delegate.blocks.produced).toBeNumber();
         expect(delegate.production).toBeObject();
         expect(delegate.production.approval).toBeNumber();
-        expect(delegate.production.productivity).toBeNumber();
         expect(delegate.forged.fees).toBeNumber();
         expect(delegate.forged.rewards).toBeNumber();
         expect(delegate.forged.total).toBeNumber();

diff --git a/__tests__/integration/core-tester-cli/__fixtures__/delegates-page-1.json b/__tests__/integration/core-tester-cli/__fixtures__/delegates-page-1.json
@@ -18,7 +18,6 @@
             "rank": 1,
             "blocks": {
                 "produced": 15605,
-                "missed": 709,
                 "last": {
                     "id": "9508080167740922063",
                     "timestamp": {
@@ -29,8 +28,7 @@
                 }
             },
             "production": {
-                "approval": 0.34,
-                "productivity": 95.65
+                "approval": 0.34
             },
             "forged": {
                 "fees": 74694705072,
@@ -46,7 +44,6 @@
             "rank": 2,
             "blocks": {
                 "produced": 15104,
-                "missed": 493,
                 "last": {
                     "id": "6408769526029163610",
                     "timestamp": {
@@ -57,8 +54,7 @@
                 }
             },
             "production": {
-                "approval": 0.06,
-                "productivity": 96.84
+                "approval": 0.06
             },
             "forged": {
                 "fees": 50980000000,
@@ -73,12 +69,10 @@
             "votes": 6343253260000,
             "rank": 3,
             "blocks": {
-                "produced": 4165,
-                "missed": 785
+                "produced": 4165
             },
             "production": {
-                "approval": 0.05,
-                "productivity": 84.14
+                "approval": 0.05
             },
             "forged": {
                 "fees": 3550000000,

diff --git a/__tests__/integration/core-tester-cli/__fixtures__/delegates-page-2.json b/__tests__/integration/core-tester-cli/__fixtures__/delegates-page-2.json
@@ -18,7 +18,6 @@
             "rank": 4,
             "blocks": {
                 "produced": 1551,
-                "missed": 180,
                 "last": {
                     "id": "3658545612136752676",
                     "timestamp": {
@@ -29,8 +28,7 @@
                 }
             },
             "production": {
-                "approval": 0.05,
-                "productivity": 89.6
+                "approval": 0.05
             },
             "forged": {
                 "fees": 5060000000,
@@ -45,12 +43,10 @@
             "votes": 4500000000000,
             "rank": 5,
             "blocks": {
-                "produced": 14572,
-                "missed": 772
+                "produced": 14572
             },
             "production": {
-                "approval": 0.04,
-                "productivity": 94.97
+                "approval": 0.04
             },
             "forged": {
                 "fees": 29670020960,
@@ -65,12 +61,10 @@
             "votes": 4013860773791,
             "rank": 6,
             "blocks": {
-                "produced": 2650,
-                "missed": 950
+                "produced": 2650
             },
             "production": {
-                "approval": 0.03,
-                "productivity": 73.61
+                "approval": 0.03
             },
             "forged": {
                 "fees": 3000000000,

diff --git a/__tests__/unit/core-database/repositories/delegates-business-repository.test.ts b/__tests__/unit/core-database/repositories/delegates-business-repository.test.ts
@@ -371,7 +371,6 @@ describe("Delegate Repository", () => {
                 publicKey: "test",
                 voteBalance: new Bignum(10000 * constants.SATOSHI),
                 producedBlocks: 1000,
-                missedBlocks: 500,
             };
             const height = 1;
 

diff --git a/__tests__/unit/core-utils/delegate-calculator.test.ts b/__tests__/unit/core-utils/delegate-calculator.test.ts
@@ -3,18 +3,13 @@ import "./mocks/core-container-calculator";
 
 import { Wallet } from "@arkecosystem/core-database";
 import { Bignum } from "@arkecosystem/crypto";
-import {
-    calculateApproval,
-    calculateForgedTotal,
-    calculateProductivity,
-} from "../../../packages/core-utils/src/delegate-calculator";
+import { calculateApproval, calculateForgedTotal } from "../../../packages/core-utils/src/delegate-calculator";
 
 let delegate: Wallet;
 
 beforeEach(() => {
     delegate = new Wallet("D61xc3yoBQDitwjqUspMPx1ooET6r1XLt7");
     delegate.producedBlocks = 0;
-    delegate.missedBlocks = 0;
 });
 
 describe("Delegate Calculator", () => {
@@ -38,22 +33,6 @@ describe("Delegate Calculator", () => {
         });
     });
 
-    describe("calculateProductivity", () => {
-        it("should calculate correctly for a value above 0", () => {
-            delegate.missedBlocks = 10;
-            delegate.producedBlocks = 100;
-
-            expect(calculateProductivity(delegate)).toBe(90.91);
-        });
-
-        it("should calculate correctly for a value of 0", () => {
-            delegate.missedBlocks = 0;
-            delegate.producedBlocks = 0;
-
-            expect(calculateProductivity(delegate)).toBe(0.0);
-        });
-    });
-
     describe("calculateForgedTotal", () => {
         it("should calculate correctly", () => {
             delegate.forgedFees = new Bignum(10);

diff --git a/deprecated/core-graphql/src/defs/types.ts b/deprecated/core-graphql/src/defs/types.ts
@@ -42,7 +42,6 @@ export const types = `
     balance: Float
     voteBalance: Float
     producedBlocks: Float
-    missedBlocks: Float
     transactions(limit: Limit, offset: Offset, orderBy: OrderByInput): [Transaction]
     blocks(limit: Limit, offset: Offset, orderBy: OrderByInput): [Block]
   }

diff --git a/packages/core-api/src/versions/1/delegates/transformer.ts b/packages/core-api/src/versions/1/delegates/transformer.ts
@@ -7,10 +7,8 @@ export function transformDelegateLegacy(model) {
         publicKey: model.publicKey,
         vote: `${model.voteBalance}`,
         producedblocks: model.producedBlocks,
-        missedblocks: model.missedBlocks,
         forged: model.forged,
         rate: model.rate,
         approval: delegateCalculator.calculateApproval(model),
-        productivity: delegateCalculator.calculateProductivity(model),
     };
 }
diff --git a/packages/core-api/src/versions/2/delegates/schema.ts b/packages/core-api/src/versions/2/delegates/schema.ts
@@ -62,9 +62,6 @@ export const index: object = {
             producedBlocks: Joi.number()
                 .integer()
                 .min(0),
-            missedBlocks: Joi.number()
-                .integer()
-                .min(0),
         },
     },
 };
@@ -107,9 +104,7 @@ export const search: object = {
         forgedFees: schemaIntegerBetween,
         forgedRewards: schemaIntegerBetween,
         forgedTotal: schemaIntegerBetween,
-        missedBlocks: schemaIntegerBetween,
         producedBlocks: schemaIntegerBetween,
-        productivity: schemaPercentage,
         voteBalance: schemaIntegerBetween,
     },
 };
@@ -187,9 +182,6 @@ export const voters: object = {
             producedBlocks: Joi.number()
                 .integer()
                 .min(0),
-            missedBlocks: Joi.number()
-                .integer()
-                .min(0),
         },
     },
 };

diff --git a/packages/core-api/src/versions/2/delegates/transformer.ts b/packages/core-api/src/versions/2/delegates/transformer.ts
@@ -9,11 +9,9 @@ export function transformDelegate(delegate) {
         rank: delegate.rate,
         blocks: {
             produced: delegate.producedBlocks,
-            missed: delegate.missedBlocks,
         },
         production: {
             approval: delegateCalculator.calculateApproval(delegate),
-            productivity: delegateCalculator.calculateProductivity(delegate),
         },
         forged: {
             fees: +delegate.forgedFees.toFixed(),

diff --git a/packages/core-api/src/versions/2/wallets/schema.ts b/packages/core-api/src/versions/2/wallets/schema.ts
@@ -27,9 +27,6 @@ export const index: object = {
             producedBlocks: Joi.number()
                 .integer()
                 .min(0),
-            missedBlocks: Joi.number()
-                .integer()
-                .min(0),
         },
     },
 };
@@ -201,9 +198,6 @@ export const search: object = {
         producedBlocks: Joi.number()
             .integer()
             .min(0),
-        missedBlocks: Joi.number()
-            .integer()
-            .min(0),
         balance: Joi.object().keys({
             from: Joi.number().integer(),
             to: Joi.number().integer(),

diff --git a/packages/core-database-postgres/src/integrity-verifier.ts b/packages/core-database-postgres/src/integrity-verifier.ts
@@ -179,7 +179,6 @@ export class IntegrityVerifier {
             wallet.producedBlocks = +block.totalProduced;
         });
 
-        // NOTE: This is unreliable but the number of missed blocks is NOT used for the consensus, only for the public API.
         const delegateWallets = this.walletManager
             .allByUsername()
             .sort((a: Database.IWallet, b: Database.IWallet) => b.voteBalance.comparedTo(a.voteBalance));

diff --git a/packages/core-database-postgres/src/models/index.ts b/packages/core-database-postgres/src/models/index.ts
@@ -3,4 +3,3 @@ export * from "./block";
 export * from "./migration";
 export * from "./round";
 export * from "./transaction";
-export * from "./wallet";