Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5242 

3a23d2ae rpc: fix build, ctx does not exist yet on this branch (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-03-07 11:07:00 +02:00
parent c0057d1f62 3a23d2ae0d
commit 171f5aacf3
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rpc/core_rpc_server.cpp
View File

@ -1347,7 +1347,7 @@ namespace cryptonote
error_resp.message = "Internal error: can't get last block.";
return false;
}
const bool restricted = m_restricted && ctx;
const bool restricted = m_restricted;
bool response_filled = fill_block_header_response(last_block, false, last_block_height, last_block_hash, res.block_header, req.fill_pow_hash && !restricted);
if (!response_filled)
{
@ -1389,7 +1389,7 @@ namespace cryptonote
return false;
}
uint64_t block_height = boost::get<txin_gen>(blk.miner_tx.vin.front()).height;
const bool restricted = m_restricted && ctx;
const bool restricted = m_restricted;
bool response_filled = fill_block_header_response(blk, orphan, block_height, block_hash, res.block_header, req.fill_pow_hash && !restricted);
if (!response_filled)
{
@ -1439,7 +1439,7 @@ namespace cryptonote
return false;
}
res.headers.push_back(block_header_response());
const bool restricted = m_restricted && ctx;
const bool restricted = m_restricted;
bool response_filled = fill_block_header_response(blk, false, block_height, block_hash, res.headers.back(), req.fill_pow_hash && !restricted);
if (!response_filled)
{
@ -1473,7 +1473,7 @@ namespace cryptonote
error_resp.message = "Internal error: can't get block by height. Height = " + std::to_string(req.height) + '.';
return false;
}
const bool restricted = m_restricted && ctx;
const bool restricted = m_restricted;
bool response_filled = fill_block_header_response(blk, false, req.height, block_hash, res.block_header, req.fill_pow_hash && !restricted);
if (!response_filled)
{
@ -1528,7 +1528,7 @@ namespace cryptonote
return false;
}
uint64_t block_height = boost::get<txin_gen>(blk.miner_tx.vin.front()).height;
const bool restricted = m_restricted && ctx;
const bool restricted = m_restricted;
bool response_filled = fill_block_header_response(blk, orphan, block_height, block_hash, res.block_header, req.fill_pow_hash && !restricted);
if (!response_filled)
{