Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

block_tests.cpp: Fix generate_empty_blocks

Browse source
This commit is contained in:
theoreticalbts 2015-10-29 19:17:21 -04:00
parent 9d3652e9ec
commit d1d06213e1
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tests/tests/block_tests.cpp
View file

@ -131,14 +131,15 @@ BOOST_AUTO_TEST_CASE( generate_empty_blocks )
// TODO: Don't generate this here // TODO: Don't generate this here
auto init_account_priv_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("null_key")) ); auto init_account_priv_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("null_key")) );
signed_block b200; signed_block cutoff_block;
{ {
database db; database db;
db.open(data_dir.path(), make_genesis ); db.open(data_dir.path(), make_genesis );
b = db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); b = db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing);
// TODO: Change this test when we correct #406
// n.b. we generate GRAPHENE_MIN_UNDO_HISTORY+1 extra blocks which will be discarded on save // n.b. we generate GRAPHENE_MIN_UNDO_HISTORY+1 extra blocks which will be discarded on save
for( uint32_t i = 1; i < 200+GRAPHENE_MIN_UNDO_HISTORY+1; ++i ) for( uint32_t i = 1; ; ++i )
{ {
BOOST_CHECK( db.head_block_id() == b.id() ); BOOST_CHECK( db.head_block_id() == b.id() );
//witness_id_type prev_witness = b.witness; //witness_id_type prev_witness = b.witness;
@ -146,8 +147,12 @@ BOOST_AUTO_TEST_CASE( generate_empty_blocks )
//BOOST_CHECK( cur_witness != prev_witness ); //BOOST_CHECK( cur_witness != prev_witness );
b = db.generate_block(db.get_slot_time(1), cur_witness, init_account_priv_key, database::skip_nothing); b = db.generate_block(db.get_slot_time(1), cur_witness, init_account_priv_key, database::skip_nothing);
BOOST_CHECK( b.witness == cur_witness ); BOOST_CHECK( b.witness == cur_witness );
if( i == 199 ) uint32_t cutoff_height = db.get_dynamic_global_properties().last_irreversible_block_num;
b200 = b; if( cutoff_height >= 200 )
{
cutoff_block = *(db.fetch_block_by_number( cutoff_height ));
break;
}
} }
db.close(); db.close();
} }
@ -155,7 +160,7 @@ BOOST_AUTO_TEST_CASE( generate_empty_blocks )
database db; database db;
db.open(data_dir.path(), []{return genesis_state_type();}); db.open(data_dir.path(), []{return genesis_state_type();});
BOOST_CHECK_EQUAL( db.head_block_num(), 200 ); BOOST_CHECK_EQUAL( db.head_block_num(), 200 );
b = b200; b = cutoff_block;
for( uint32_t i = 0; i < 200; ++i ) for( uint32_t i = 0; i < 200; ++i )
{ {
BOOST_CHECK( db.head_block_id() == b.id() ); BOOST_CHECK( db.head_block_id() == b.id() );