monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 16:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #726

Browse source 
5dd91f6 fix formatting error on bitmonero print_block return (Mike C)
ee71946 Fix typo on bitmonerod rpc method error. (Mike C)
This commit is contained in:
Riccardo Spagni 2016-03-15 23:50:13 +02:00
commit 5fd90c71b6
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/daemon/rpc_command_executor.cpp
View file

@ -66,7 +66,7 @@ namespace {
<< "is orphan: " << header.orphan_status << std::endl << "is orphan: " << header.orphan_status << std::endl
<< "height: " << boost::lexical_cast<std::string>(header.height) << std::endl << "height: " << boost::lexical_cast<std::string>(header.height) << std::endl
<< "depth: " << boost::lexical_cast<std::string>(header.depth) << std::endl << "depth: " << boost::lexical_cast<std::string>(header.depth) << std::endl
<< "hash: " << header.hash << "hash: " << header.hash << std::endl
<< "difficulty: " << boost::lexical_cast<std::string>(header.difficulty) << std::endl << "difficulty: " << boost::lexical_cast<std::string>(header.difficulty) << std::endl
<< "reward: " << boost::lexical_cast<std::string>(header.reward); << "reward: " << boost::lexical_cast<std::string>(header.reward);
} }

6
src/rpc/core_rpc_server.cpp
View file

@ -544,7 +544,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("To big height: ") + std::to_string(h) + ", current blockchain height = " + std::to_string(m_core.get_current_blockchain_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());
} }
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;
@ -792,7 +792,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("To big height: ") + std::to_string(req.height) + ", current blockchain height = " + std::to_string(m_core.get_current_blockchain_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());
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);
@ -838,7 +838,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("To big height: ") + std::to_string(req.height) + ", current blockchain height = " + std::to_string(m_core.get_current_blockchain_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());
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);