From 75129e7ebeea2d59de0bd26b677f05e9365ca651 Mon Sep 17 00:00:00 2001 From: Ivan Shumkov Date: Tue, 11 Apr 2023 18:50:19 +0800 Subject: [PATCH 1/2] feat(dashmate): tenderdash latest block time in status --- packages/dashmate/src/status/scopes/platform.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/dashmate/src/status/scopes/platform.js b/packages/dashmate/src/status/scopes/platform.js index 7ffe430cfef..045c187dfd4 100644 --- a/packages/dashmate/src/status/scopes/platform.js +++ b/packages/dashmate/src/status/scopes/platform.js @@ -112,6 +112,7 @@ function getPlatformScopeFactory(dockerCompose, const lastBlockHeight = tenderdashStatus.sync_info.latest_block_height; const lastBlockHash = tenderdashStatus.sync_info.latest_block_hash; const latestAppHash = tenderdashStatus.sync_info.latest_app_hash; + const latestBlockTime = tenderdashStatus.sync_info.latest_block_time; const platformPeers = parseInt(tenderdashNetInfo.n_peers, 10); const { listening } = tenderdashNetInfo; @@ -120,6 +121,7 @@ function getPlatformScopeFactory(dockerCompose, platform.tenderdash.listening = listening; platform.tenderdash.lastBlockHeight = lastBlockHeight; platform.tenderdash.lastBlockHash = lastBlockHash; + platform.tenderdash.lastBlockTime = latestBlockTime; platform.tenderdash.catchingUp = catchingUp; platform.tenderdash.peers = platformPeers; platform.tenderdash.moniker = moniker; From 3eb63726ce3cdb72ff32e34a84cd674058b3985e Mon Sep 17 00:00:00 2001 From: Ivan Shumkov Date: Tue, 11 Apr 2023 18:55:45 +0800 Subject: [PATCH 2/2] test: update tests --- packages/dashmate/src/commands/group/status.js | 2 +- packages/dashmate/src/commands/status/index.js | 2 +- packages/dashmate/src/commands/status/platform.js | 2 +- packages/dashmate/src/status/scopes/platform.js | 15 ++++++++------- .../test/unit/status/scopes/overview.spec.js | 3 ++- .../test/unit/status/scopes/platform.spec.js | 3 ++- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/packages/dashmate/src/commands/group/status.js b/packages/dashmate/src/commands/group/status.js index a4c24983cb5..c6b29aa08e4 100644 --- a/packages/dashmate/src/commands/group/status.js +++ b/packages/dashmate/src/commands/group/status.js @@ -64,7 +64,7 @@ class GroupStatusCommand extends GroupBaseCommand { } else { plain['Platform Status'] = colors.status(scope.platform.tenderdash.serviceStatus)(scope.platform.tenderdash.serviceStatus); plain['Platform Version'] = scope.platform.tenderdash.version; - plain['Platform Block Height'] = scope.platform.tenderdash.lastBlockHeight; + plain['Platform Block Height'] = scope.platform.tenderdash.latestBlockHeight; plain['Platform Peers'] = scope.platform.tenderdash.peers; plain['Platform Network'] = scope.platform.tenderdash.network; } diff --git a/packages/dashmate/src/commands/status/index.js b/packages/dashmate/src/commands/status/index.js index b85066c0d11..c2ff732a5dc 100644 --- a/packages/dashmate/src/commands/status/index.js +++ b/packages/dashmate/src/commands/status/index.js @@ -89,7 +89,7 @@ class StatusCommand extends ConfigBaseCommand { if (platform.tenderdash.serviceStatus === ServiceStatusEnum.up) { plain['Platform Version'] = platform.tenderdash.version; - plain['Platform Block Height'] = platform.tenderdash.lastBlockHeight; + plain['Platform Block Height'] = platform.tenderdash.latestBlockHeight; plain['Platform Peers'] = platform.tenderdash.peers; plain['Platform Network'] = platform.tenderdash.network; } diff --git a/packages/dashmate/src/commands/status/platform.js b/packages/dashmate/src/commands/status/platform.js index 00bdc8a27ef..5944fdb6283 100644 --- a/packages/dashmate/src/commands/status/platform.js +++ b/packages/dashmate/src/commands/status/platform.js @@ -79,7 +79,7 @@ class PlatformStatusCommand extends ConfigBaseCommand { if (tenderdash.version) { const { version: tenderdashVersion, - lastBlockHeight: platformBlockHeight, + latestBlockHeight: platformBlockHeight, latestAppHash: platformLatestAppHash, peers: platformPeers, network: tenderdashNetwork, diff --git a/packages/dashmate/src/status/scopes/platform.js b/packages/dashmate/src/status/scopes/platform.js index 045c187dfd4..457a6428424 100644 --- a/packages/dashmate/src/status/scopes/platform.js +++ b/packages/dashmate/src/status/scopes/platform.js @@ -72,8 +72,9 @@ function getPlatformScopeFactory(dockerCompose, version: null, listening: null, catchingUp: null, - lastBlockHash: null, - lastBlockHeight: null, + latestBlockHash: null, + latestBlockHeight: null, + latestBlockTime: null, latestAppHash: null, peers: null, moniker: null, @@ -109,8 +110,8 @@ function getPlatformScopeFactory(dockerCompose, const { version, network, moniker } = tenderdashStatus.node_info; const catchingUp = tenderdashStatus.sync_info.catching_up; - const lastBlockHeight = tenderdashStatus.sync_info.latest_block_height; - const lastBlockHash = tenderdashStatus.sync_info.latest_block_hash; + const latestBlockHeight = tenderdashStatus.sync_info.latest_block_height; + const latestBlockHash = tenderdashStatus.sync_info.latest_block_hash; const latestAppHash = tenderdashStatus.sync_info.latest_app_hash; const latestBlockTime = tenderdashStatus.sync_info.latest_block_time; @@ -119,9 +120,9 @@ function getPlatformScopeFactory(dockerCompose, platform.tenderdash.version = version; platform.tenderdash.listening = listening; - platform.tenderdash.lastBlockHeight = lastBlockHeight; - platform.tenderdash.lastBlockHash = lastBlockHash; - platform.tenderdash.lastBlockTime = latestBlockTime; + platform.tenderdash.latestBlockHeight = latestBlockHeight; + platform.tenderdash.latestBlockHash = latestBlockHash; + platform.tenderdash.latestBlockTime = latestBlockTime; platform.tenderdash.catchingUp = catchingUp; platform.tenderdash.peers = platformPeers; platform.tenderdash.moniker = moniker; diff --git a/packages/dashmate/test/unit/status/scopes/overview.spec.js b/packages/dashmate/test/unit/status/scopes/overview.spec.js index b653c5fccef..6fce7913ff1 100644 --- a/packages/dashmate/test/unit/status/scopes/overview.spec.js +++ b/packages/dashmate/test/unit/status/scopes/overview.spec.js @@ -54,8 +54,9 @@ describe('getOverviewScopeFactory', () => { serviceStatus: ServiceStatusEnum.up, version: null, catchingUp: null, - lastBlockHeight: null, + latestBlockHeight: null, latestAppHash: null, + latestBlockTime: null, peers: null, network: null, }, diff --git a/packages/dashmate/test/unit/status/scopes/platform.spec.js b/packages/dashmate/test/unit/status/scopes/platform.spec.js index 43cf6135988..a8ba335abd4 100644 --- a/packages/dashmate/test/unit/status/scopes/platform.spec.js +++ b/packages/dashmate/test/unit/status/scopes/platform.spec.js @@ -128,7 +128,8 @@ describe('getPlatformScopeFactory', () => { expect(scope.tenderdash.serviceStatus).to.be.equal(ServiceStatusEnum.error); expect(scope.tenderdash.version).to.be.equal(null); expect(scope.tenderdash.catchingUp).to.be.equal(null); - expect(scope.tenderdash.lastBlockHeight).to.be.equal(null); + expect(scope.tenderdash.latestBlockHeight).to.be.equal(null); + expect(scope.tenderdash.latestBlockTime).to.be.equal(null); expect(scope.tenderdash.latestAppHash).to.be.equal(null); }); });