DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Test

Browse Source
This commit is contained in:
jl777
2018-09-21 20:34:54 -11:00
parent a4602c8956
commit 4eafa6062d
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/rpcblockchain.cpp
View File

@@ -1432,14 +1432,13 @@ UniValue getchaintips(const UniValue& params, bool fHelp)
if (pprev) if (pprev)
setTips.erase(pprev); setTips.erase(pprev);
} }
} // Always report the currently active tip.
// Always report the currently active tip. setTips.insert(chainActive.LastTip());
setTips.insert(chainActive.LastTip());
/* Construct the output array. */
/* Construct the output array. */ UniValue res(UniValue::VARR); const CBlockIndex *forked;
UniValue res(UniValue::VARR); const CBlockIndex *forked; BOOST_FOREACH(const CBlockIndex* block, setTips)
BOOST_FOREACH(const CBlockIndex* block, setTips) BOOST_FOREACH(const CBlockIndex* block, setTips)
BOOST_FOREACH(const CBlockIndex* block, setTips)
{ {
UniValue obj(UniValue::VOBJ); UniValue obj(UniValue::VOBJ);
obj.push_back(Pair("height", block->nHeight)); obj.push_back(Pair("height", block->nHeight));
@@ -1449,7 +1448,7 @@ UniValue getchaintips(const UniValue& params, bool fHelp)
{ {
const int branchLen = block->nHeight - forked->nHeight; const int branchLen = block->nHeight - forked->nHeight;
obj.push_back(Pair("branchlen", branchLen)); obj.push_back(Pair("branchlen", branchLen));
string status; string status;
if (chainActive.Contains(block)) { if (chainActive.Contains(block)) {
// This block is part of the currently active chain. // This block is part of the currently active chain.
@@ -1474,7 +1473,7 @@ UniValue getchaintips(const UniValue& params, bool fHelp)
} }
res.push_back(obj); res.push_back(obj);
} }
}
return res; return res;
} }