Merge pull request #2314

c22d22e2 Cleanup test impact of adding safesyncmode() method (Howard Chu)
9a859844 Toggle SAFE syncmode on and off automatically (Howard Chu)
This commit is contained in:
Riccardo Spagni 2017-08-26 23:43:22 +02:00
commit 36b978f50e
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
11 changed files with 61 additions and 2 deletions

View file

@ -303,6 +303,7 @@ namespace cryptonote
<< " [Your node is " << abs_diff << " blocks (" << ((abs_diff - diff_v2) / (24 * 60 * 60 / DIFFICULTY_TARGET_V1)) + (diff_v2 / (24 * 60 * 60 / DIFFICULTY_TARGET_V2)) << " days) "
<< (0 <= diff ? std::string("behind") : std::string("ahead"))
<< "] " << ENDL << "SYNCHRONIZATION started");
m_core.safesyncmode(false);
}
LOG_PRINT_L1("Remote blockchain height: " << hshd.current_height << ", id: " << hshd.top_id);
context.m_state = cryptonote_connection_context::state_synchronizing;
@ -1513,6 +1514,7 @@ skip:
<< "**********************************************************************");
m_core.on_synchronized();
}
m_core.safesyncmode(true);
return true;
}
//------------------------------------------------------------------------------------------------------------------------