Merge pull request #5405

ffdbcfb6 core: don't check block rate nor fork time in regtest mode (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-04-16 22:32:06 +02:00
commit ce2f46f76b
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -1609,6 +1609,9 @@ namespace cryptonote
//----------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------
bool core::check_fork_time() bool core::check_fork_time()
{ {
if (m_nettype == FAKECHAIN)
return true;
HardFork::State state = m_blockchain_storage.get_hard_fork_state(); HardFork::State state = m_blockchain_storage.get_hard_fork_state();
const el::Level level = el::Level::Warning; const el::Level level = el::Level::Warning;
switch (state) { switch (state) {
@ -1824,7 +1827,7 @@ namespace cryptonote
//----------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------
bool core::check_block_rate() 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"); MDEBUG("Not checking block rate, offline or syncing");
return true; return true;