diff --git a/contracts/eosio.system/producer_pay.cpp b/contracts/eosio.system/producer_pay.cpp index 65cefba2ea4ad3dd623501f2e32213784027ee34..c497cc15ece56e5326e43d0bda95e2d4106ab286 100644 --- a/contracts/eosio.system/producer_pay.cpp +++ b/contracts/eosio.system/producer_pay.cpp @@ -47,10 +47,7 @@ namespace eosiosystem { if( timestamp.slot - _gstate.last_producer_schedule_update.slot > 120 ) { update_elected_producers( timestamp ); - print( "maybe update bids \n" ); - if( (timestamp.slot - _gstate.last_name_close.slot) > blocks_per_day ) { - print( "update bids" ); name_bid_table bids(_self,_self); auto idx = bids.get_index(); auto highest = idx.begin(); diff --git a/contracts/eosio.system/voting.cpp b/contracts/eosio.system/voting.cpp index 4ecc2ae33406f05e5c7c62539c885f693e01511f..0c4d5616b678abca53c89d7d96092d2f178dc85e 100644 --- a/contracts/eosio.system/voting.cpp +++ b/contracts/eosio.system/voting.cpp @@ -84,7 +84,7 @@ namespace eosiosystem { _producers.modify( *it, 0, [&](auto& p) { p.time_became_active = block_time; }); - } else if ( block_time.slot > 2 * 21 * 12 + it->time_became_active.slot && + } else if ( block_time.slot > (2 * 21 * 12 * 100) + it->time_became_active.slot && block_time.slot > it->last_produced_block_time.slot + blocks_per_day ) { _producers.modify( *it, 0, [&](auto& p) { p.producer_key = public_key(); diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp index 3b772b2620617b4a47d2821423d46cfd7285a554..69d1862f87a70dd977d8d380b86f6b3e53dacd79 100644 --- a/libraries/testing/tester.cpp +++ b/libraries/testing/tester.cpp @@ -294,9 +294,7 @@ namespace eosio { namespace testing { _start_block(control->head_block_time() + fc::microseconds(config::block_interval_us)); auto c = packed_transaction::none; - if( fc::raw::pack_size(trx) > 1000 ) - { - wdump((fc::raw::pack_size(trx))); + if( fc::raw::pack_size(trx) > 1000 ) { c = packed_transaction::zlib; } diff --git a/unittests/eosio.system_tests.cpp b/unittests/eosio.system_tests.cpp index 19f52c4c035aa8031e90c16394d9f4651aaf5f8e..fe8013c9734f3f64e589ad87d7dc67477a74ade7 100644 --- a/unittests/eosio.system_tests.cpp +++ b/unittests/eosio.system_tests.cpp @@ -1576,7 +1576,7 @@ BOOST_FIXTURE_TEST_CASE(multiple_producer_pay, eosio_system_tester, * boost::uni // re-register deactivated producer and let him produce blocks again const uint32_t initial_unpaid_blocks = inactive_prod_info["unpaid_blocks"].as(); regproducer(producer_names[one_inactive_index]); - produce_blocks(21 * 12); + produce_blocks(21 * 12 * 100); auto reactivated_prod_info = get_producer_info(producer_names[one_inactive_index]); const uint32_t unpaid_blocks = reactivated_prod_info["unpaid_blocks"].as(); BOOST_REQUIRE(initial_unpaid_blocks + 12 <= unpaid_blocks);