Merge pull request #1133
cec090f
Revert "Fix fake 'network synchronized, begin using' messages" (moneromooo-monero)
This commit is contained in:
commit
d60826c0b9
|
@ -957,12 +957,9 @@ namespace cryptonote
|
||||||
}
|
}
|
||||||
//-----------------------------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------------------------
|
||||||
void core::set_target_blockchain_height(uint64_t target_blockchain_height)
|
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
|
uint64_t core::get_target_blockchain_height() const
|
||||||
{
|
{
|
||||||
|
|
|
@ -261,7 +261,7 @@ namespace cryptonote
|
||||||
if(context.m_state == cryptonote_connection_context::state_synchronizing)
|
if(context.m_state == cryptonote_connection_context::state_synchronizing)
|
||||||
return true;
|
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;
|
context.m_state = cryptonote_connection_context::state_normal;
|
||||||
if(is_inital)
|
if(is_inital)
|
||||||
|
|
Loading…
Reference in New Issue