monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 10:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Noticed two spellings of the word 'response' in the codebase, one 'responce' and the other 'response'.

Browse source 
Fixed to the standard spelling 'response'. This may fix some functionality - some calls had mixed spellings.
This commit is contained in:
NanoAkron 2016-09-29 14:38:12 +01:00
parent e01a9ea507
commit 25be1d3ed4
4 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/daemon/rpc_command_executor.cpp
View file

@ -57,7 +57,7 @@ namespace {
tools::msg_writer() << boost::format("%-10s %-25s %-25s %s") % prefix % id_str % addr_str % elapsed; tools::msg_writer() << boost::format("%-10s %-25s %-25s %s") % prefix % id_str % addr_str % elapsed;
} }
void print_block_header(cryptonote::block_header_responce const & header) void print_block_header(cryptonote::block_header_response const & header)
{ {
tools::success_msg_writer() tools::success_msg_writer()
<< "timestamp: " << boost::lexical_cast<std::string>(header.timestamp) << std::endl << "timestamp: " << boost::lexical_cast<std::string>(header.timestamp) << std::endl

40
src/rpc/core_rpc_server.cpp
View file

@ -830,19 +830,19 @@ namespace cryptonote
return reward; return reward;
} }
//------------------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------------------
bool core_rpc_server::fill_block_header_responce(const block& blk, bool orphan_status, uint64_t height, const crypto::hash& hash, block_header_responce& responce) bool core_rpc_server::fill_block_header_response(const block& blk, bool orphan_status, uint64_t height, const crypto::hash& hash, block_header_response& response)
{ {
responce.major_version = blk.major_version; response.major_version = blk.major_version;
responce.minor_version = blk.minor_version; response.minor_version = blk.minor_version;
responce.timestamp = blk.timestamp; response.timestamp = blk.timestamp;
responce.prev_hash = string_tools::pod_to_hex(blk.prev_id); response.prev_hash = string_tools::pod_to_hex(blk.prev_id);
responce.nonce = blk.nonce; response.nonce = blk.nonce;
responce.orphan_status = orphan_status; response.orphan_status = orphan_status;
responce.height = height; response.height = height;
responce.depth = m_core.get_current_blockchain_height() - height - 1; response.depth = m_core.get_current_blockchain_height() - height - 1;
responce.hash = string_tools::pod_to_hex(hash); response.hash = string_tools::pod_to_hex(hash);
responce.difficulty = m_core.get_blockchain_storage().block_difficulty(height); response.difficulty = m_core.get_blockchain_storage().block_difficulty(height);
responce.reward = get_block_reward(blk); response.reward = get_block_reward(blk);
return true; return true;
} }
//------------------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------------------
@ -871,8 +871,8 @@ namespace cryptonote
error_resp.message = "Internal error: can't get last block."; error_resp.message = "Internal error: can't get last block.";
return false; return false;
} }
bool responce_filled = fill_block_header_responce(last_block, false, last_block_height, last_block_hash, res.block_header); bool response_filled = fill_block_header_response(last_block, false, last_block_height, last_block_hash, res.block_header);
if (!responce_filled) if (!response_filled)
{ {
error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR; error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR;
error_resp.message = "Internal error: can't produce valid response."; error_resp.message = "Internal error: can't produce valid response.";
@ -912,8 +912,8 @@ namespace cryptonote
return false; return false;
} }
uint64_t block_height = boost::get<txin_gen>(blk.miner_tx.vin.front()).height; uint64_t block_height = boost::get<txin_gen>(blk.miner_tx.vin.front()).height;
bool responce_filled = fill_block_header_responce(blk, false, block_height, block_hash, res.block_header); bool response_filled = fill_block_header_response(blk, false, block_height, block_hash, res.block_header);
if (!responce_filled) if (!response_filled)
{ {
error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR; error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR;
error_resp.message = "Internal error: can't produce valid response."; error_resp.message = "Internal error: can't produce valid response.";
@ -945,8 +945,8 @@ namespace cryptonote
error_resp.message = "Internal error: can't get block by height. Height = " + std::to_string(req.height) + '.'; error_resp.message = "Internal error: can't get block by height. Height = " + std::to_string(req.height) + '.';
return false; return false;
} }
bool responce_filled = fill_block_header_responce(blk, false, req.height, block_hash, res.block_header); bool response_filled = fill_block_header_response(blk, false, req.height, block_hash, res.block_header);
if (!responce_filled) if (!response_filled)
{ {
error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR; error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR;
error_resp.message = "Internal error: can't produce valid response."; error_resp.message = "Internal error: can't produce valid response.";
@ -999,8 +999,8 @@ namespace cryptonote
return false; return false;
} }
uint64_t block_height = boost::get<txin_gen>(blk.miner_tx.vin.front()).height; uint64_t block_height = boost::get<txin_gen>(blk.miner_tx.vin.front()).height;
bool responce_filled = fill_block_header_responce(blk, false, block_height, block_hash, res.block_header); bool response_filled = fill_block_header_response(blk, false, block_height, block_hash, res.block_header);
if (!responce_filled) if (!response_filled)
{ {
error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR; error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR;
error_resp.message = "Internal error: can't produce valid response."; error_resp.message = "Internal error: can't produce valid response.";

2
src/rpc/core_rpc_server.h
View file

@ -172,7 +172,7 @@ private:
//utils //utils
uint64_t get_block_reward(const block& blk); uint64_t get_block_reward(const block& blk);
bool fill_block_header_responce(const block& blk, bool orphan_status, uint64_t height, const crypto::hash& hash, block_header_responce& responce); bool fill_block_header_response(const block& blk, bool orphan_status, uint64_t height, const crypto::hash& hash, block_header_response& response);
core& m_core; core& m_core;
nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<cryptonote::core> >& m_p2p; nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<cryptonote::core> >& m_p2p;

12
src/rpc/core_rpc_server_commands_defs.h
View file

@ -631,7 +631,7 @@ namespace cryptonote
}; };
}; };
struct block_header_responce struct block_header_response
{ {
uint8_t major_version; uint8_t major_version;
uint8_t minor_version; uint8_t minor_version;
@ -671,7 +671,7 @@ namespace cryptonote
struct response struct response
{ {
std::string status; std::string status;
block_header_responce block_header; block_header_response block_header;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(block_header) KV_SERIALIZE(block_header)
@ -695,7 +695,7 @@ namespace cryptonote
struct response struct response
{ {
std::string status; std::string status;
block_header_responce block_header; block_header_response block_header;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(block_header) KV_SERIALIZE(block_header)
@ -719,7 +719,7 @@ namespace cryptonote
struct response struct response
{ {
std::string status; std::string status;
block_header_responce block_header; block_header_response block_header;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(block_header) KV_SERIALIZE(block_header)
@ -745,7 +745,7 @@ namespace cryptonote
struct response struct response
{ {
std::string status; std::string status;
block_header_responce block_header; block_header_response block_header;
std::vector<std::string> tx_hashes; std::vector<std::string> tx_hashes;
std::string blob; std::string blob;
std::string json; std::string json;
@ -940,7 +940,7 @@ namespace cryptonote
struct response struct response
{ {
std::string status; std::string status;
std::vector<block_header_responce> headers; std::vector<block_header_response> headers;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(status) KV_SERIALIZE(status)