highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-05 01:10:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

rpc: Refactor blockhash parse in getchaintxstats

Browse Source
This commit is contained in:
João Barbosa 2018-01-05 15:26:24 +00:00
parent 3fa556aee2
commit 501b43921c
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/rpc/blockchain.cpp
View File

@ -1542,15 +1542,12 @@ UniValue getchaintxstats(const JSONRPCRequest& request)
const CBlockIndex* pindex; const CBlockIndex* pindex;
int blockcount = 30 * 24 * 60 * 60 / Params().GetConsensus().nPowTargetSpacing; // By default: 1 month int blockcount = 30 * 24 * 60 * 60 / Params().GetConsensus().nPowTargetSpacing; // By default: 1 month
bool havehash = !request.params[1].isNull(); if (request.params[1].isNull()) {
uint256 hash; LOCK(cs_main);
if (havehash) { pindex = chainActive.Tip();
hash = uint256S(request.params[1].get_str()); } else {
} uint256 hash = uint256S(request.params[1].get_str());
{
LOCK(cs_main); LOCK(cs_main);
if (havehash) {
auto it = mapBlockIndex.find(hash); auto it = mapBlockIndex.find(hash);
if (it == mapBlockIndex.end()) { if (it == mapBlockIndex.end()) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
@ -1559,9 +1556,6 @@ UniValue getchaintxstats(const JSONRPCRequest& request)
if (!chainActive.Contains(pindex)) { if (!chainActive.Contains(pindex)) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Block is not in main chain"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Block is not in main chain");
} }
} else {
pindex = chainActive.Tip();
}
} }
assert(pindex != nullptr); assert(pindex != nullptr);