monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 20:19:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

formatting: 2-spaces indentation

Browse source
This commit is contained in:
Ilya Kitaev 2016-09-26 23:39:30 +03:00
parent 545a48f098
commit cda4cb969a
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/wallet/wallet2.cpp
View file

@ -4055,30 +4055,30 @@ std::string wallet2::get_daemon_address() const
uint64_t wallet2::get_daemon_blockchain_height(string &err) uint64_t wallet2::get_daemon_blockchain_height(string &err)
{ {
// XXX: DRY violation. copy-pasted from simplewallet.cpp:get_daemon_blockchain_height() // XXX: DRY violation. copy-pasted from simplewallet.cpp:get_daemon_blockchain_height()
// consider to move it from simplewallet to wallet2 ? // consider to move it from simplewallet to wallet2 ?
COMMAND_RPC_GET_HEIGHT::request req; COMMAND_RPC_GET_HEIGHT::request req;
COMMAND_RPC_GET_HEIGHT::response res = boost::value_initialized<COMMAND_RPC_GET_HEIGHT::response>(); COMMAND_RPC_GET_HEIGHT::response res = boost::value_initialized<COMMAND_RPC_GET_HEIGHT::response>();
m_daemon_rpc_mutex.lock(); m_daemon_rpc_mutex.lock();
bool ok = net_utils::invoke_http_json_remote_command2(m_daemon_address + "/getheight", req, res, m_http_client); bool ok = net_utils::invoke_http_json_remote_command2(m_daemon_address + "/getheight", req, res, m_http_client);
m_daemon_rpc_mutex.unlock(); m_daemon_rpc_mutex.unlock();
// XXX: DRY violation. copy-pasted from simplewallet.cpp:interpret_rpc_response() // XXX: DRY violation. copy-pasted from simplewallet.cpp:interpret_rpc_response()
if (ok) if (ok)
{
if (res.status == CORE_RPC_STATUS_BUSY)
{ {
if (res.status == CORE_RPC_STATUS_BUSY) err = "daemon is busy. Please try again later.";
{
err = "daemon is busy. Please try again later.";
}
else if (res.status != CORE_RPC_STATUS_OK)
{
err = res.status;
}
} }
else else if (res.status != CORE_RPC_STATUS_OK)
{ {
err = "possibly lost connection to daemon"; err = res.status;
} }
return res.height; }
else
{
err = "possibly lost connection to daemon";
}
return res.height;
} }
void wallet2::set_tx_note(const crypto::hash &txid, const std::string &note) void wallet2::set_tx_note(const crypto::hash &txid, const std::string &note)