highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-24 09:31:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

scripted-diff: rest/rpc: Use renamed EnsureAny*()

Browse Source 
-BEGIN VERIFY SCRIPT-
sed -i -E 's@Ensure([^(]+)(\((request\.|)context\))@EnsureAny\1\2@g' \
    -- src/rest.cpp src/rpc/*.cpp
-END VERIFY SCRIPT-
This commit is contained in:
Carl Dong
2021-04-13 17:04:43 -04:00
parent 1570c7ee98
commit 6fb65b49f4
5 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/rest.cpp
View File

@@ -181,7 +181,7 @@ static bool rest_headers(const std::any& context,
headers.reserve(count);
{
LOCK(cs_main);
ChainstateManager& chainman = EnsureChainman(context);
ChainstateManager& chainman = EnsureAnyChainman(context);
tip = chainman.ActiveChain().Tip();
const CBlockIndex* pindex = chainman.m_blockman.LookupBlockIndex(hash);
while (pindex != nullptr && chainman.ActiveChain().Contains(pindex)) {
@@ -251,7 +251,7 @@ static bool rest_block(const std::any& context,
CBlockIndex* tip = nullptr;
{
LOCK(cs_main);
ChainstateManager& chainman = EnsureChainman(context);
ChainstateManager& chainman = EnsureAnyChainman(context);
tip = chainman.ActiveChain().Tip();
pblockindex = chainman.m_blockman.LookupBlockIndex(hash);
if (!pblockindex) {
@@ -538,7 +538,7 @@ static bool rest_getutxos(const std::any& context, HTTPRequest* req, const std::
std::string bitmapStringRepresentation;
std::vector<bool> hits;
bitmap.resize((vOutPoints.size() + 7) / 8);
ChainstateManager& chainman = EnsureChainman(context);
ChainstateManager& chainman = EnsureAnyChainman(context);
{
auto process_utxos = [&vOutPoints, &outs, &hits](const CCoinsView& view, const CTxMemPool& mempool) {
for (const COutPoint& vOutPoint : vOutPoints) {
@@ -642,7 +642,7 @@ static bool rest_blockhash_by_height(const std::any& context, HTTPRequest* req,
CBlockIndex* pblockindex = nullptr;
{
LOCK(cs_main);
const CChain& active_chain = EnsureChainman(context).ActiveChain();
const CChain& active_chain = EnsureAnyChainman(context).ActiveChain();
if (blockheight > active_chain.Height()) {
return RESTERR(req, HTTP_NOT_FOUND, "Block height out of range");
}