From c5666879744413435ed813c61c8352f656af6577 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Thu, 25 Jun 2015 14:14:30 -0400 Subject: [PATCH] fix tests properly --- libraries/chain/db_block.cpp | 4 +--- tests/tests/block_tests.cpp | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 39588ef7..387c388c 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -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 ) { try { - _pending_block.timestamp = head_block_time(); - processed_transaction result; 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, "", ("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) ) { FC_ASSERT(trx.relative_expiration == 0, "May not use transactions with a reference block in block 1!"); } diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index 88315bc0..eb4adefd 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -462,8 +462,10 @@ BOOST_AUTO_TEST_CASE( tapos ) db1.push_transaction(trx); now += db1.block_interval(); b = db1.generate_block(now, db1.get_scheduled_witness(1).first, delegate_priv_key, database::skip_nothing); + /* now += db1.block_interval(); b = db1.generate_block(now, db1.get_scheduled_witness(1).first, delegate_priv_key, database::skip_nothing); + */ trx.clear(); trx.operations.push_back(transfer_operation({asset(), account_id_type(), nathan_id, asset(50)}));