From a80d25f9df1e720c1135cc9108325fb7ce8c8b94 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Sun, 27 Oct 2019 08:54:18 -0300 Subject: [PATCH 1/3] fix flag --- libraries/chain/account_evaluator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/chain/account_evaluator.cpp b/libraries/chain/account_evaluator.cpp index 3185c456..96429304 100644 --- a/libraries/chain/account_evaluator.cpp +++ b/libraries/chain/account_evaluator.cpp @@ -287,7 +287,7 @@ void_result account_update_evaluator::do_apply( const account_update_operation& fc::optional< bool > flag = o.extensions.value.update_last_voting_time; if((o.new_options->votes != acnt->options.votes || o.new_options->voting_account != acnt->options.voting_account) || - flag) + (flag.valid() && *flag)) aso.last_vote_time = d.head_block_time(); } ); } From 84f30926bc4f6338347cca07faa3ddc6e032bec1 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Sun, 27 Oct 2019 08:54:37 -0300 Subject: [PATCH 2/3] clean newlines gpos_tests --- tests/tests/gpos_tests.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tests/tests/gpos_tests.cpp b/tests/tests/gpos_tests.cpp index 37c9475d..5ee36a9e 100644 --- a/tests/tests/gpos_tests.cpp +++ b/tests/tests/gpos_tests.cpp @@ -348,12 +348,10 @@ BOOST_AUTO_TEST_CASE( dividends ) } BOOST_AUTO_TEST_CASE( gpos_basic_dividend_distribution_to_core_asset ) -{ - +{ using namespace graphene; ACTORS((alice)(bob)(carol)(dave)); try { - const auto& core = asset_id_type()(db); BOOST_TEST_MESSAGE("Creating test asset"); { @@ -474,13 +472,11 @@ BOOST_AUTO_TEST_CASE( gpos_basic_dividend_distribution_to_core_asset ) verify_pending_balance(carol, test_asset_object, 0); verify_pending_balance(dave, test_asset_object, 10000); - advance_to_next_payout_time(); generate_blocks(db.get_dynamic_global_properties().next_maintenance_time); generate_block(); // get the maintenance skip slots out of the way - auto verify_dividend_payout_operations = [&](const account_object& destination_account, const asset& expected_payout) { BOOST_TEST_MESSAGE("Verifying the virtual op was created"); @@ -516,12 +512,10 @@ BOOST_AUTO_TEST_CASE( gpos_basic_dividend_distribution_to_core_asset ) } } - BOOST_AUTO_TEST_CASE( voting ) { ACTORS((alice)(bob)); try { - // move to hardfork generate_blocks( HARDFORK_GPOS_TIME ); generate_block(); @@ -704,8 +698,6 @@ BOOST_AUTO_TEST_CASE( rolling_period_start ) { // period start rolls automatically after HF try { - // advance to HF - // update default gpos global parameters to make this thing faster update_gpos_global(518400, 86400, HARDFORK_GPOS_TIME); generate_blocks(HARDFORK_GPOS_TIME); @@ -731,6 +723,7 @@ BOOST_AUTO_TEST_CASE( rolling_period_start ) throw; } } + BOOST_AUTO_TEST_CASE( worker_dividends_voting ) { try { @@ -1042,7 +1035,6 @@ BOOST_AUTO_TEST_CASE( proxy_voting ) { ACTORS((alice)(bob)); try { - // move to hardfork generate_blocks( HARDFORK_GPOS_TIME ); generate_block(); @@ -1153,11 +1145,11 @@ BOOST_AUTO_TEST_CASE( no_proposal ) throw; } } + BOOST_AUTO_TEST_CASE( database_api ) { ACTORS((alice)(bob)); try { - // move to hardfork generate_blocks( HARDFORK_GPOS_TIME ); generate_block(); @@ -1251,4 +1243,5 @@ BOOST_AUTO_TEST_CASE( database_api ) throw; } } + BOOST_AUTO_TEST_SUITE_END() From 7c1966247b4fc29f130a12063e4c2d61d4e04b10 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Sun, 27 Oct 2019 09:10:53 -0300 Subject: [PATCH 3/3] adapt gpos_tests to changed flag --- tests/tests/gpos_tests.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/tests/gpos_tests.cpp b/tests/tests/gpos_tests.cpp index 5ee36a9e..fb3f6987 100644 --- a/tests/tests/gpos_tests.cpp +++ b/tests/tests/gpos_tests.cpp @@ -110,6 +110,7 @@ struct gpos_fixture: database_fixture op.account = account_id; op.new_options = account_id(db).options; op.new_options->votes.insert(vote_for); + op.extensions.value.update_last_voting_time = true; trx.operations.push_back(op); set_expiration(db, trx); trx.validate();