From cf1e5967ee25d4b53672821093709bc8c5e8a64a Mon Sep 17 00:00:00 2001 From: Michael Toutonghi Date: Fri, 18 May 2018 02:46:21 -0700 Subject: [PATCH] fix getinfo, cleanup hash --- src/primitives/block.cpp | 2 +- src/primitives/block.h | 5 +---- src/rpcmisc.cpp | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp index 58164ad8a..fc937ec3d 100644 --- a/src/primitives/block.cpp +++ b/src/primitives/block.cpp @@ -20,7 +20,7 @@ uint256 CBlockHeader::GetSHA256DHash() const uint256 CBlockHeader::GetVerusHash() const { - if (hashPrevBlock == uint256()) + if (hashPrevBlock.IsNull()) // always use SHA256D for genesis block return SerializeHash(*this); else diff --git a/src/primitives/block.h b/src/primitives/block.h index c7a379172..6a45648f3 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -75,10 +75,7 @@ public: uint256 GetHash() const { - if (hashPrevBlock.IsNull()) - return (this->GetSHA256DHash()); - else - return (this->*hashFunction)(); + return (this->*hashFunction)(); } uint256 GetSHA256DHash() const; diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index bbc87871b..419ee382a 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -204,7 +204,7 @@ UniValue getinfo(const UniValue& params, bool fHelp) if ( ASSETCHAINS_STAKED != 0 ) obj.push_back(Pair("staked", ASSETCHAINS_STAKED)); if ( ASSETCHAINS_LWMAPOS != 0 ) - obj.push_back(Pair("verus proof of stake percent", ASSETCHAINS_LWMAPOS)); + obj.push_back(Pair("veruspos", ASSETCHAINS_LWMAPOS)); } return obj; }