nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4788

Browse Source 
8f3963d2 wallet2: demote a few uninteresting recurring logs to TRACE (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-11-16 11:07:21 +02:00
commit c8cc65f30a
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wallet/wallet2.cpp
View File

@ -2300,7 +2300,7 @@ void wallet2::remove_obsolete_pool_txs(const std::vector<crypto::hash> &tx_hashe
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
void wallet2::update_pool_state(bool refreshed) void wallet2::update_pool_state(bool refreshed)
{ {
MDEBUG("update_pool_state start"); MTRACE("update_pool_state start");
auto keys_reencryptor = epee::misc_utils::create_scope_leave_handler([&, this]() { auto keys_reencryptor = epee::misc_utils::create_scope_leave_handler([&, this]() {
if (m_encrypt_keys_after_refresh) if (m_encrypt_keys_after_refresh)
@ -2319,7 +2319,7 @@ void wallet2::update_pool_state(bool refreshed)
THROW_WALLET_EXCEPTION_IF(!r, error::no_connection_to_daemon, "get_transaction_pool_hashes.bin"); THROW_WALLET_EXCEPTION_IF(!r, error::no_connection_to_daemon, "get_transaction_pool_hashes.bin");
THROW_WALLET_EXCEPTION_IF(res.status == CORE_RPC_STATUS_BUSY, error::daemon_busy, "get_transaction_pool_hashes.bin"); THROW_WALLET_EXCEPTION_IF(res.status == CORE_RPC_STATUS_BUSY, error::daemon_busy, "get_transaction_pool_hashes.bin");
THROW_WALLET_EXCEPTION_IF(res.status != CORE_RPC_STATUS_OK, error::get_tx_pool_error); THROW_WALLET_EXCEPTION_IF(res.status != CORE_RPC_STATUS_OK, error::get_tx_pool_error);
MDEBUG("update_pool_state got pool"); MTRACE("update_pool_state got pool");
// remove any pending tx that's not in the pool // remove any pending tx that's not in the pool
std::unordered_map<crypto::hash, wallet2::unconfirmed_transfer_details>::iterator it = m_unconfirmed_txs.begin(); std::unordered_map<crypto::hash, wallet2::unconfirmed_transfer_details>::iterator it = m_unconfirmed_txs.begin();
@ -2376,7 +2376,7 @@ void wallet2::update_pool_state(bool refreshed)
} }
} }
} }
MDEBUG("update_pool_state done first loop"); MTRACE("update_pool_state done first loop");
// remove pool txes to us that aren't in the pool anymore // remove pool txes to us that aren't in the pool anymore
// but only if we just refreshed, so that the tx can go in // but only if we just refreshed, so that the tx can go in
@ -2385,7 +2385,7 @@ void wallet2::update_pool_state(bool refreshed)
if (refreshed) if (refreshed)
remove_obsolete_pool_txs(res.tx_hashes); remove_obsolete_pool_txs(res.tx_hashes);
MDEBUG("update_pool_state done second loop"); MTRACE("update_pool_state done second loop");
// gather txids of new pool txes to us // gather txids of new pool txes to us
std::vector<std::pair<crypto::hash, bool>> txids; std::vector<std::pair<crypto::hash, bool>> txids;
@ -2522,7 +2522,7 @@ void wallet2::update_pool_state(bool refreshed)
LOG_PRINT_L0("Error calling gettransactions daemon RPC: r " << r << ", status " << res.status); LOG_PRINT_L0("Error calling gettransactions daemon RPC: r " << r << ", status " << res.status);
} }
} }
MDEBUG("update_pool_state end"); MTRACE("update_pool_state end");
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
void wallet2::fast_refresh(uint64_t stop_height, uint64_t &blocks_start_height, std::list<crypto::hash> &short_chain_history, bool force) void wallet2::fast_refresh(uint64_t stop_height, uint64_t &blocks_start_height, std::list<crypto::hash> &short_chain_history, bool force)