Merge pull request #1133

cec090f Revert "Fix fake 'network synchronized, begin using' messages" (moneromooo-monero)
8 years ago · d60826c0b9
parent 60e527f1c2 cec090fc8a
commit d60826c0b9
2 changed files with 2 additions and 5 deletions
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@ -958,10 +958,7 @@ namespace cryptonote
  //-----------------------------------------------------------------------------------------------
  void core::set_target_blockchain_height(uint64_t target_blockchain_height)
  {
-    if (target_blockchain_height > m_target_blockchain_height)
-    {
-      m_target_blockchain_height = target_blockchain_height;
-    }
+    m_target_blockchain_height = target_blockchain_height;
  }
  //-----------------------------------------------------------------------------------------------
  uint64_t core::get_target_blockchain_height() const
--- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
@ -261,7 +261,7 @@ namespace cryptonote
    if(context.m_state == cryptonote_connection_context::state_synchronizing)
      return true;

-    if(m_core.have_block(hshd.top_id) && !(hshd.current_height < m_core.get_target_blockchain_height()))
+    if(m_core.have_block(hshd.top_id))
    {
      context.m_state = cryptonote_connection_context::state_normal;
      if(is_inital)