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

Win32 compile fix, add extra data to one call to FC_ASSERT for better debugging.

Browse source
This commit is contained in:
Eric Frias 2015-10-08 15:16:25 -04:00
parent 7bc7004ef9
commit 573a6d6e97
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/chain/db_block.cpp
View file

@ -640,7 +640,11 @@ const witness_object& database::validate_block_header( uint32_t skip, const sign
witness_id_type scheduled_witness = get_scheduled_witness( slot_num ); witness_id_type scheduled_witness = get_scheduled_witness( slot_num );
#warning remove this hardfork check for next release #ifdef _MSC_VER
# pragma message ("WARNING: remove this hardfork check for next release")
#else
# warning remove this hardfork check for next release
#endif
if( next_block.block_num() > 58500 ) { if( next_block.block_num() > 58500 ) {
FC_ASSERT( next_block.witness == scheduled_witness, "Witness produced block at wrong time", FC_ASSERT( next_block.witness == scheduled_witness, "Witness produced block at wrong time",
("block witness",next_block.witness)("scheduled",scheduled_witness)("slot_num",slot_num) ); ("block witness",next_block.witness)("scheduled",scheduled_witness)("slot_num",slot_num) );

2
libraries/chain/vesting_balance_evaluator.cpp
View file

@ -99,7 +99,7 @@ void_result vesting_balance_withdraw_evaluator::do_evaluate( const vesting_balan
const time_point_sec now = d.head_block_time(); const time_point_sec now = d.head_block_time();
const vesting_balance_object& vbo = op.vesting_balance( d ); const vesting_balance_object& vbo = op.vesting_balance( d );
FC_ASSERT( op.owner == vbo.owner ); FC_ASSERT( op.owner == vbo.owner, "", ("op.owner", op.owner)("vbo.owner", vbo.owner) );
FC_ASSERT( vbo.is_withdraw_allowed( now, op.amount ), "", ("now", now)("op", op)("vbo", vbo) ); FC_ASSERT( vbo.is_withdraw_allowed( now, op.amount ), "", ("now", now)("op", op)("vbo", vbo) );
assert( op.amount <= vbo.balance ); // is_withdraw_allowed should fail before this check is reached assert( op.amount <= vbo.balance ); // is_withdraw_allowed should fail before this check is reached