aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2020-07-08 17:10:39 -0500
committerluigi1111 <luigi1111w@gmail.com>2020-07-08 17:10:39 -0500
commit634262f3f5c78b74d12b2e685cc6b5d6ff6382b5 (patch)
treefcdb007b3b56c3eede07b759f7ab68f7b2c10b7a
parentMerge pull request #6566 (diff)
parentcryptonote_core: remove "We are most likely forked" message (diff)
downloadmonero-634262f3f5c78b74d12b2e685cc6b5d6ff6382b5.tar.xz
Merge pull request #6568
f037121 cryptonote_core: remove 'We are most likely forked' message (moneromooo-monero)
-rw-r--r--src/cryptonote_core/cryptonote_core.cpp24
-rw-r--r--src/cryptonote_core/cryptonote_core.h12
2 files changed, 0 insertions, 36 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index 0f8bde3e9..0c73a316f 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -1656,7 +1656,6 @@ namespace cryptonote
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_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));
@@ -1667,29 +1666,6 @@ namespace cryptonote
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
{
return get_blockchain_storage().get_ideal_hard_fork_version();
diff --git a/src/cryptonote_core/cryptonote_core.h b/src/cryptonote_core/cryptonote_core.h
index 988f25ceb..68c5651f1 100644
--- a/src/cryptonote_core/cryptonote_core.h
+++ b/src/cryptonote_core/cryptonote_core.h
@@ -1001,18 +1001,6 @@ namespace cryptonote
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
*
* @return true