diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-03-07 11:07:00 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-03-07 11:07:00 +0200 |
| commit | 171f5aacf3b9ec280731c01dbe1ed016514c8a7d (patch) | |
| tree | 25293dd23fcee1b7a4e942e7a24485d5ab3b06e1 | |
| parent | Merge pull request #5241 (diff) | |
| parent | rpc: fix build, ctx does not exist yet on this branch (diff) | |
| download | monero-171f5aacf3b9ec280731c01dbe1ed016514c8a7d.tar.xz | |
Merge pull request #5242
3a23d2ae rpc: fix build, ctx does not exist yet on this branch (moneromooo-monero)
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 581c6bff4..5719bb3c5 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -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) { |