4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-14 12:26:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4750

Browse Source 
e61062b6 use current height - 1 for top block height in err msgs (cryptochangements34)
This commit is contained in:
Riccardo Spagni 2018-11-14 21:32:21 +02:00
commit 23fc891555
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rpc/core_rpc_server.cpp
View File

@ -1018,7 +1018,7 @@ namespace cryptonote
if(m_core.get_current_blockchain_height() <= h) if(m_core.get_current_blockchain_height() <= h)
{ {
error_resp.code = CORE_RPC_ERROR_CODE_TOO_BIG_HEIGHT; error_resp.code = CORE_RPC_ERROR_CODE_TOO_BIG_HEIGHT;
error_resp.message = std::string("Too big height: ") + std::to_string(h) + ", current blockchain height = " + std::to_string(m_core.get_current_blockchain_height()); error_resp.message = std::string("Requested block height: ") + std::to_string(h) + " greater than current top block height: " + std::to_string(m_core.get_current_blockchain_height() - 1);
} }
res = string_tools::pod_to_hex(m_core.get_block_id_by_height(h)); res = string_tools::pod_to_hex(m_core.get_block_id_by_height(h));
return true; return true;
@ -1465,7 +1465,7 @@ namespace cryptonote
if(m_core.get_current_blockchain_height() <= req.height) if(m_core.get_current_blockchain_height() <= req.height)
{ {
error_resp.code = CORE_RPC_ERROR_CODE_TOO_BIG_HEIGHT; error_resp.code = CORE_RPC_ERROR_CODE_TOO_BIG_HEIGHT;
error_resp.message = std::string("Too big height: ") + std::to_string(req.height) + ", current blockchain height = " + std::to_string(m_core.get_current_blockchain_height()); error_resp.message = std::string("Requested block height: ") + std::to_string(req.height) + " greater than current top block height: " + std::to_string(m_core.get_current_blockchain_height() - 1);
return false; return false;
} }
crypto::hash block_hash = m_core.get_block_id_by_height(req.height); crypto::hash block_hash = m_core.get_block_id_by_height(req.height);
@ -1510,7 +1510,7 @@ namespace cryptonote
if(m_core.get_current_blockchain_height() <= req.height) if(m_core.get_current_blockchain_height() <= req.height)
{ {
error_resp.code = CORE_RPC_ERROR_CODE_TOO_BIG_HEIGHT; error_resp.code = CORE_RPC_ERROR_CODE_TOO_BIG_HEIGHT;
error_resp.message = std::string("Too big height: ") + std::to_string(req.height) + ", current blockchain height = " + std::to_string(m_core.get_current_blockchain_height()); error_resp.message = std::string("Requested block height: ") + std::to_string(req.height) + " greater than current top block height: " + std::to_string(m_core.get_current_blockchain_height() - 1);
return false; return false;
} }
block_hash = m_core.get_block_id_by_height(req.height); block_hash = m_core.get_block_id_by_height(req.height);