aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2019-04-16 22:32:06 +0200
committerRiccardo Spagni <ric@spagni.net>2019-04-16 22:32:06 +0200
commitce2f46f76b221e3539a5cc105df95dd6dc5bccaa (patch)
tree17bbc6c2cb51cb29023453ba38f8a0b45f085b49
parentMerge pull request #5404 (diff)
parentcore: don't check block rate nor fork time in regtest mode (diff)
downloadmonero-ce2f46f76b221e3539a5cc105df95dd6dc5bccaa.tar.xz
Merge pull request #5405
ffdbcfb6 core: don't check block rate nor fork time in regtest mode (moneromooo-monero)
-rw-r--r--src/cryptonote_core/cryptonote_core.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index 91dea4982..be1ea5a17 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -1609,6 +1609,9 @@ namespace cryptonote
//-----------------------------------------------------------------------------------------------
bool core::check_fork_time()
{
+ if (m_nettype == FAKECHAIN)
+ return true;
+
HardFork::State state = m_blockchain_storage.get_hard_fork_state();
const el::Level level = el::Level::Warning;
switch (state) {
@@ -1824,7 +1827,7 @@ namespace cryptonote
//-----------------------------------------------------------------------------------------------
bool core::check_block_rate()
{
- if (m_offline || m_target_blockchain_height > get_current_blockchain_height())
+ if (m_offline || m_nettype == FAKECHAIN || m_target_blockchain_height > get_current_blockchain_height())
{
MDEBUG("Not checking block rate, offline or syncing");
return true;