Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6568

Browse Source 
f037121 cryptonote_core: remove 'We are most likely forked' message (moneromooo-monero)
This commit is contained in:
luigi1111 2020-07-08 17:10:39 -05:00
commit 634262f3f5
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/cryptonote_core/cryptonote_core.cpp
View File

@ -1656,7 +1656,6 @@ namespace cryptonote
m_starter_message_showed = true; m_starter_message_showed = true;
} }
m_fork_moaner.do_call(boost::bind(&core::check_fork_time, this));
m_txpool_auto_relayer.do_call(boost::bind(&core::relay_txpool_transactions, this)); m_txpool_auto_relayer.do_call(boost::bind(&core::relay_txpool_transactions, this));
m_check_updates_interval.do_call(boost::bind(&core::check_updates, this)); m_check_updates_interval.do_call(boost::bind(&core::check_updates, this));
m_check_disk_space_interval.do_call(boost::bind(&core::check_disk_space, this)); m_check_disk_space_interval.do_call(boost::bind(&core::check_disk_space, this));
@ -1667,29 +1666,6 @@ namespace cryptonote
return true; return true;
} }
//----------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------
bool core::check_fork_time()
{
if (m_nettype == FAKECHAIN)
return true;
HardFork::State state = m_blockchain_storage.get_hard_fork_state();
el::Level level;
switch (state) {
case HardFork::LikelyForked:
level = el::Level::Warning;
MCLOG_RED(level, "global", "**********************************************************************");
MCLOG_RED(level, "global", "Last scheduled hard fork is too far in the past.");
MCLOG_RED(level, "global", "We are most likely forked from the network. Daemon update needed now.");
MCLOG_RED(level, "global", "**********************************************************************");
break;
case HardFork::UpdateNeeded:
break;
default:
break;
}
return true;
}
//-----------------------------------------------------------------------------------------------
uint8_t core::get_ideal_hard_fork_version() const uint8_t core::get_ideal_hard_fork_version() const
{ {
return get_blockchain_storage().get_ideal_hard_fork_version(); return get_blockchain_storage().get_ideal_hard_fork_version();

12
src/cryptonote_core/cryptonote_core.h
View File

@ -1000,18 +1000,6 @@ namespace cryptonote
*/ */
bool check_tx_inputs_keyimages_domain(const transaction& tx) const; bool check_tx_inputs_keyimages_domain(const transaction& tx) const;
/**
* @brief checks HardFork status and prints messages about it
*
* Checks the status of HardFork and logs/prints if an update to
* the daemon is necessary.
*
* @note see Blockchain::get_hard_fork_state and HardFork::State
*
* @return true
*/
bool check_fork_time();
/** /**
* @brief attempts to relay any transactions in the mempool which need it * @brief attempts to relay any transactions in the mempool which need it
* *