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

fix tests properly

Browse source
This commit is contained in:
Daniel Larimer 2015-06-25 14:14:30 -04:00
parent 342abe6ca1
commit c566687974
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/chain/db_block.cpp
View file

@ -181,8 +181,6 @@ bool database::_push_block(const signed_block& new_block)
*/ */
processed_transaction database::push_transaction( const signed_transaction& trx, uint32_t skip ) processed_transaction database::push_transaction( const signed_transaction& trx, uint32_t skip )
{ try { { try {
_pending_block.timestamp = head_block_time();
processed_transaction result; processed_transaction result;
with_skip_flags( skip, [&]() with_skip_flags( skip, [&]()
{ {
@ -502,7 +500,7 @@ processed_transaction database::_apply_transaction( const signed_transaction& tr
FC_ASSERT( trx_expiration <= _pending_block.timestamp + chain_parameters.maximum_time_until_expiration, "", FC_ASSERT( trx_expiration <= _pending_block.timestamp + chain_parameters.maximum_time_until_expiration, "",
("trx_expiration",trx_expiration)("_pending_block.timestamp",_pending_block.timestamp)("max_til_exp",chain_parameters.maximum_time_until_expiration)); ("trx_expiration",trx_expiration)("_pending_block.timestamp",_pending_block.timestamp)("max_til_exp",chain_parameters.maximum_time_until_expiration));
} }
FC_ASSERT( _pending_block.timestamp <= trx_expiration ); FC_ASSERT( _pending_block.timestamp <= trx_expiration, "", ("pending.timestamp",_pending_block.timestamp)("trx_exp",trx_expiration) );
} else if( !(skip & skip_transaction_signatures) ) { } else if( !(skip & skip_transaction_signatures) ) {
FC_ASSERT(trx.relative_expiration == 0, "May not use transactions with a reference block in block 1!"); FC_ASSERT(trx.relative_expiration == 0, "May not use transactions with a reference block in block 1!");
} }

2
tests/tests/block_tests.cpp
View file

@ -462,8 +462,10 @@ BOOST_AUTO_TEST_CASE( tapos )
db1.push_transaction(trx); db1.push_transaction(trx);
now += db1.block_interval(); now += db1.block_interval();
b = db1.generate_block(now, db1.get_scheduled_witness(1).first, delegate_priv_key, database::skip_nothing); b = db1.generate_block(now, db1.get_scheduled_witness(1).first, delegate_priv_key, database::skip_nothing);
/*
now += db1.block_interval(); now += db1.block_interval();
b = db1.generate_block(now, db1.get_scheduled_witness(1).first, delegate_priv_key, database::skip_nothing); b = db1.generate_block(now, db1.get_scheduled_witness(1).first, delegate_priv_key, database::skip_nothing);
*/
trx.clear(); trx.clear();
trx.operations.push_back(transfer_operation({asset(), account_id_type(), nathan_id, asset(50)})); trx.operations.push_back(transfer_operation({asset(), account_id_type(), nathan_id, asset(50)}));