From fe552a42d0e6a29f48c39dfca44d02a9a2548698 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Wed, 7 Oct 2015 11:09:28 -0400 Subject: [PATCH] removing unnecessary assert --- libraries/chain/db_block.cpp | 2 ++ libraries/chain/fork_database.cpp | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 22ab9d8f..217949d4 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -141,6 +141,7 @@ bool database::_push_block(const signed_block& new_block) // push all blocks on the new fork for( auto ritr = branches.first.rbegin(); ritr != branches.first.rend(); ++ritr ) { + ilog( "pushing blocks from fork ${n} ${id}", ("n",(*ritr)->data.block_num())("id",(*ritr)->data.id()) ); optional except; try { undo_database::session session = _undo_db.start_undo_session(); @@ -151,6 +152,7 @@ bool database::_push_block(const signed_block& new_block) catch ( const fc::exception& e ) { except = e; } if( except ) { + wlog( "exception thrown while switching forks ${e}", ("e",except->to_detail_string() ) ); // remove the rest of branches.first from the fork_db, those blocks are invalid while( ritr != branches.first.rend() ) { diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp index 4f25dd87..85c9500d 100644 --- a/libraries/chain/fork_database.cpp +++ b/libraries/chain/fork_database.cpp @@ -69,7 +69,6 @@ void fork_database::_push_block(const item_ptr& item) FC_ASSERT( item->num > std::max( 0, int64_t(_head->num) - (_max_size) ), "attempting to push a block that is too old", ("item->num",item->num)("head",_head->num)("max_size",_max_size)); - FC_ASSERT( item->num <= _head->num + 1, "", ("item->num",item->num)("head+1",_head->num+1) );//MAX_BLOCK_REORDERING ); } if( _head && item->previous_id() != block_id_type() )