oxen-io/oxen-core
2
1
Fork 0
mirror of https://github.com/oxen-io/oxen-core.git synced 2023-12-14 02:22:56 +01:00
Code Issues Projects Releases Wiki Activity

Inline update_miner_block_template and remove from core header

Browse source
This commit is contained in:
Doyle 2019-08-07 10:30:46 +10:00
parent de1d9ab53d
commit c2ef3b413a
2 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/cryptonote_core/cryptonote_core.cpp
View file

@ -1547,7 +1547,7 @@ namespace cryptonote
add_new_block(b, bvc, nullptr /*checkpoint*/);
cleanup_handle_incoming_blocks(true);
//anyway - update miner template
update_miner_block_template();
m_miner.on_block_chain_update();
m_miner.resume();
@ -1662,7 +1662,7 @@ namespace cryptonote
}
add_new_block(*b, bvc, checkpoint);
if(update_miner_blocktemplate && bvc.m_added_to_main_chain)
update_miner_block_template();
m_miner.on_block_chain_update();
return true;
CATCH_ENTRY_L0("core::handle_incoming_block()", false);
@ -1777,12 +1777,6 @@ namespace cryptonote
return m_mempool.print_pool(short_format);
}
//-----------------------------------------------------------------------------------------------
bool core::update_miner_block_template()
{
m_miner.on_block_chain_update();
return true;
}
//-----------------------------------------------------------------------------------------------
static bool check_storage_server_ping(time_t last_time_storage_server_pinged)
{
const auto elapsed = std::time(nullptr) - last_time_storage_server_pinged;

9
src/cryptonote_core/cryptonote_core.h
View file

@ -979,15 +979,6 @@ namespace cryptonote
struct tx_verification_batch_info { const cryptonote::transaction *tx; crypto::hash tx_hash; tx_verification_context &tvc; bool &result; };
bool handle_incoming_tx_accumulated_batch(std::vector<tx_verification_batch_info> &tx_info, bool keeped_by_block);
/**
* @copydoc miner::on_block_chain_update
*
* @note see miner::on_block_chain_update
*
* @return true
*/
bool update_miner_block_template();
/**
* @brief act on a set of command line options given
*