From f689c1713967b5a20d15c4a2c7e27745f03883a2 Mon Sep 17 00:00:00 2001 From: supaiku Date: Mon, 11 Feb 2019 19:18:51 +0100 Subject: [PATCH 1/2] fix: /node/configuration show dynamic fees --- packages/core-api/src/versions/2/node/controller.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/core-api/src/versions/2/node/controller.ts b/packages/core-api/src/versions/2/node/controller.ts index 51c7fa7d84..1ddd262520 100644 --- a/packages/core-api/src/versions/2/node/controller.ts +++ b/packages/core-api/src/versions/2/node/controller.ts @@ -45,6 +45,7 @@ export class NodeController extends Controller { const feeStatisticsData = await transactionsRepository.getFeeStatistics(); const network = this.config.get("network"); + const dynamicFees = app.resolveOptions("transactionPool").dynamicFees; return { data: { @@ -58,6 +59,7 @@ export class NodeController extends Controller { feeStatistics: super.toCollection(request, feeStatisticsData, "fee-statistics"), transactionPool: { maxTransactionAge: app.resolveOptions("transactionPool").maxTransactionAge, + dynamicFees: dynamicFees && dynamicFees.enabled ? dynamicFees : { enabled: false }, }, }, }; From 1255ff902fa3f68821404b758503242fee593a0e Mon Sep 17 00:00:00 2001 From: supaiku Date: Mon, 11 Feb 2019 20:53:21 +0100 Subject: [PATCH 2/2] test: add --- .../core-api/__tests__/v2/handlers/node.test.ts | 14 +++++++++++++- .../core-api/src/versions/2/node/controller.ts | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/core-api/__tests__/v2/handlers/node.test.ts b/packages/core-api/__tests__/v2/handlers/node.test.ts index 46a8179561..23a90e532b 100644 --- a/packages/core-api/__tests__/v2/handlers/node.test.ts +++ b/packages/core-api/__tests__/v2/handlers/node.test.ts @@ -1,4 +1,6 @@ import "@arkecosystem/core-test-utils"; + +import { app } from "@arkecosystem/core-container"; import { setUp, tearDown } from "../../__support__/setup"; import { utils } from "../utils"; @@ -51,7 +53,7 @@ describe("API 2.0 - Loader", () => { "using the %s header", (header, request) => { it("should GET the node configuration", async () => { - const response = await utils[request]("GET", "node/configuration"); + let response = await utils[request]("GET", "node/configuration"); expect(response).toBeSuccessfulResponse(); expect(response.data.data).toBeObject(); @@ -60,6 +62,16 @@ describe("API 2.0 - Loader", () => { expect(response.data.data.symbol).toBeString(); expect(response.data.data.explorer).toBeString(); expect(response.data.data.version).toBeNumber(); + + const dynamicFees = app.resolveOptions("transactionPool").dynamicFees; + expect(response.data.data.transactionPool.dynamicFees).toEqual(dynamicFees); + + app.resolveOptions("transactionPool").dynamicFees.enabled = false; + + response = await utils[request]("GET", "node/configuration"); + expect(response.data.data.transactionPool.dynamicFees).toEqual({ enabled: false }); + + app.resolveOptions("transactionPool").dynamicFees.enabled = true; }); }, ); diff --git a/packages/core-api/src/versions/2/node/controller.ts b/packages/core-api/src/versions/2/node/controller.ts index 1ddd262520..4be8f9169c 100644 --- a/packages/core-api/src/versions/2/node/controller.ts +++ b/packages/core-api/src/versions/2/node/controller.ts @@ -59,7 +59,7 @@ export class NodeController extends Controller { feeStatistics: super.toCollection(request, feeStatisticsData, "fee-statistics"), transactionPool: { maxTransactionAge: app.resolveOptions("transactionPool").maxTransactionAge, - dynamicFees: dynamicFees && dynamicFees.enabled ? dynamicFees : { enabled: false }, + dynamicFees: dynamicFees.enabled ? dynamicFees : { enabled: false }, }, }, };