diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index edd19243..52d144e9 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -102,7 +102,7 @@ std::vector database::get_block_ids_on_fork(block_id_type head_of */ bool database::push_block(const signed_block& new_block, uint32_t skip) { - idump((new_block.block_num())(new_block.id())); + //idump((new_block.block_num())(new_block.id())(new_block.timestamp)(new_block.previous)); bool result; detail::with_skip_flags( *this, skip, [&]() { @@ -131,6 +131,7 @@ bool database::_push_block(const signed_block& new_block) //Only switch forks if new_head is actually higher than head if( new_head->data.block_num() > head_block_num() ) { + wlog( "Switching to fork: ${id}", ("id",new_head->data.id()) ); auto branches = _fork_db.fetch_branch_from(new_head->data.id(), head_block_id()); // pop blocks until we hit the forked block diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 47505942..5193eee5 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -103,7 +103,6 @@ void database::open( const fc::path& data_dir, std::function genesis_loader ) { - elog( "Open Database" ); try { object_database::open(data_dir); @@ -123,7 +122,7 @@ void database::open( FC_ASSERT( head_block_num() == 0, "last block ID does not match current chain state" ); } } - idump((head_block_id())(head_block_num())); + //idump((head_block_id())(head_block_num())); } FC_CAPTURE_AND_RETHROW( (data_dir) ) } @@ -139,7 +138,7 @@ void database::close(uint32_t blocks_to_rewind) { while( true ) { - elog("pop"); + // elog("pop"); block_id_type popped_block_id = head_block_id(); pop_block(); _fork_db.remove(popped_block_id); // doesn't throw on missing diff --git a/libraries/chain/include/graphene/chain/db_with.hpp b/libraries/chain/include/graphene/chain/db_with.hpp index 9a08cdd7..d8748ea9 100644 --- a/libraries/chain/include/graphene/chain/db_with.hpp +++ b/libraries/chain/include/graphene/chain/db_with.hpp @@ -94,9 +94,10 @@ struct pending_transactions_restorer } catch( const fc::exception& e ) { - wlog( "Pending transaction became invalid after switching to block ${b}", ("b", _db.head_block_id()) ); - wlog( "The invalid pending transaction is ${t}", ("t", tx) ); - wlog( "The invalid pending transaction caused exception ${e}", ("e", e) ); + /* + wlog( "Pending transaction became invalid after switching to block ${b} ${t}", ("b", _db.head_block_id())("t",_db.head_block_time()) ); + wlog( "The invalid pending transaction caused exception ${e}", ("e", e.to_detail_string() ) ); + */ } } } diff --git a/libraries/chain/proposal_evaluator.cpp b/libraries/chain/proposal_evaluator.cpp index 6512c244..f9c7448b 100644 --- a/libraries/chain/proposal_evaluator.cpp +++ b/libraries/chain/proposal_evaluator.cpp @@ -58,7 +58,7 @@ void_result proposal_create_evaluator::do_evaluate(const proposal_create_operati GRAPHENE_ASSERT( *o.review_period_seconds >= global_parameters.committee_proposal_review_period, proposal_create_review_period_insufficient, - "Review period of ${t} required, but at least ${min} required", + "Review period of ${t} specified, but at least ${min} required", ("t", *o.review_period_seconds) ("min", global_parameters.committee_proposal_review_period) ); diff --git a/tests/tests/authority_tests.cpp b/tests/tests/authority_tests.cpp index eeed0949..4c105672 100644 --- a/tests/tests/authority_tests.cpp +++ b/tests/tests/authority_tests.cpp @@ -557,6 +557,7 @@ BOOST_FIXTURE_TEST_CASE( fired_committee_members, database_fixture ) PUSH_TX( db, trx, ~0 ); trx.operations.clear(); } + idump((get_balance(*nathan, asset_id_type()(db)))); // still no money BOOST_CHECK_EQUAL(get_balance(*nathan, asset_id_type()(db)), 5000);