From 2264aa0052a179a2c22b61b0efe77ff17f320c61 Mon Sep 17 00:00:00 2001 From: Serki Date: Tue, 22 Sep 2020 18:56:19 +0200 Subject: [PATCH] Cleanup changes for pretier diff --- libraries/chain/CMakeLists.txt | 1 - libraries/chain/database.cpp | 1 - libraries/chain/db_getter.cpp | 26 +++++++++---------- libraries/chain/db_management.cpp | 1 - libraries/chain/db_sidechain.cpp | 10 ------- .../chain/include/graphene/chain/database.hpp | 9 +------ .../graphene/chain/protocol/vesting.hpp | 2 +- libraries/chain/proposal_evaluator.cpp | 12 ++++----- tests/app/main.cpp | 3 --- tests/common/database_fixture.cpp | 2 -- tests/common/genesis_file_util.hpp | 2 +- 11 files changed, 22 insertions(+), 47 deletions(-) delete mode 100644 libraries/chain/db_sidechain.cpp diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt index 646bc5be..ee0cbd8e 100755 --- a/libraries/chain/CMakeLists.txt +++ b/libraries/chain/CMakeLists.txt @@ -19,7 +19,6 @@ if( GRAPHENE_DISABLE_UNITY_BUILD ) db_maint.cpp db_management.cpp db_market.cpp - db_sidechain.cpp db_update.cpp db_witness_schedule.cpp ) diff --git a/libraries/chain/database.cpp b/libraries/chain/database.cpp index 36e2a161..7711f543 100644 --- a/libraries/chain/database.cpp +++ b/libraries/chain/database.cpp @@ -31,7 +31,6 @@ #include "db_maint.cpp" #include "db_management.cpp" #include "db_market.cpp" -#include "db_sidechain.cpp" #include "db_update.cpp" #include "db_witness_schedule.cpp" #include "db_notify.cpp" \ No newline at end of file diff --git a/libraries/chain/db_getter.cpp b/libraries/chain/db_getter.cpp index 9805354b..11192e86 100644 --- a/libraries/chain/db_getter.cpp +++ b/libraries/chain/db_getter.cpp @@ -151,6 +151,19 @@ const std::vector database::get_winner_numbers( asset_id_type for_asse return result; } +const account_statistics_object& database::get_account_stats_by_owner( account_id_type owner )const +{ + auto& idx = get_index_type().indices().get(); + auto itr = idx.find( owner ); + FC_ASSERT( itr != idx.end(), "Can not find account statistics object for owner ${a}", ("a",owner) ); + return *itr; +} + +const witness_schedule_object& database::get_witness_schedule_object()const +{ + return *_p_witness_schedule_obj; +} + vector database::get_account_custom_authorities(account_id_type account, const operation& op)const { const auto& pindex = get_index_type().indices().get(); @@ -297,17 +310,4 @@ bool database::is_son_active( son_id_type son_id ) return (it_son != active_son_ids.end()); } -const account_statistics_object& database::get_account_stats_by_owner( account_id_type owner )const -{ - auto& idx = get_index_type().indices().get(); - auto itr = idx.find( owner ); - FC_ASSERT( itr != idx.end(), "Can not find account statistics object for owner ${a}", ("a",owner) ); - return *itr; -} - -const witness_schedule_object& database::get_witness_schedule_object()const -{ - return *_p_witness_schedule_obj; -} - } } diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 9560aae3..c6380b8c 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -43,7 +43,6 @@ database::database() : { initialize_indexes(); initialize_evaluators(); - initialize_db_sidechain(); } database::~database() diff --git a/libraries/chain/db_sidechain.cpp b/libraries/chain/db_sidechain.cpp deleted file mode 100644 index 77594b3f..00000000 --- a/libraries/chain/db_sidechain.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include - -namespace graphene { namespace chain { - -void database::initialize_db_sidechain() -{ - recreate_primary_wallet = false; -} - -} } diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index dd29bcab..cb47f36b 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -301,6 +301,7 @@ namespace graphene { namespace chain { const std::vector get_winner_numbers( asset_id_type for_asset, uint32_t count_members, uint8_t count_winners ) const; std::vector get_seeds( asset_id_type for_asset, uint8_t count_winners )const; uint64_t get_random_bits( uint64_t bound ); + const witness_schedule_object& get_witness_schedule_object()const; bool item_locked(const nft_id_type& item)const; std::set get_sons_being_deregistered(); std::set get_sons_being_reported_down(); @@ -309,7 +310,6 @@ namespace graphene { namespace chain { signed_transaction create_signed_transaction( const fc::ecc::private_key& signing_private_key, const operation& op ); bool is_son_dereg_valid( son_id_type son_id ); bool is_son_active( son_id_type son_id ); - const witness_schedule_object& get_witness_schedule_object()const; time_point_sec head_block_time()const; uint32_t head_block_num()const; @@ -633,13 +633,6 @@ namespace graphene { namespace chain { * database::close() has not been called, or failed during execution. */ bool _opened = false; - - /////////////////////// db_sidechain.cpp //////////////////// - public: - bool recreate_primary_wallet; - void initialize_db_sidechain(); - protected: - private: /// Tracks assets affected by bitshares-core issue #453 before hard fork #615 in one block flat_set _issue_453_affected_assets; diff --git a/libraries/chain/include/graphene/chain/protocol/vesting.hpp b/libraries/chain/include/graphene/chain/protocol/vesting.hpp index d3eb9560..2ac13aaf 100644 --- a/libraries/chain/include/graphene/chain/protocol/vesting.hpp +++ b/libraries/chain/include/graphene/chain/protocol/vesting.hpp @@ -137,7 +137,7 @@ FC_REFLECT(graphene::chain::cdd_vesting_policy_initializer, (start_claim)(vestin FC_REFLECT(graphene::chain::dormant_vesting_policy_initializer, ) FC_REFLECT_TYPENAME( graphene::chain::vesting_policy_initializer ) -FC_REFLECT_ENUM( graphene::chain::vesting_balance_type, (normal)(gpos)(son)) +FC_REFLECT_ENUM( graphene::chain::vesting_balance_type, (normal)(gpos)(son) ) GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::vesting_balance_create_operation::fee_parameters_type ) GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::vesting_balance_withdraw_operation::fee_parameters_type ) diff --git a/libraries/chain/proposal_evaluator.cpp b/libraries/chain/proposal_evaluator.cpp index 55c045cc..5182d5a8 100644 --- a/libraries/chain/proposal_evaluator.cpp +++ b/libraries/chain/proposal_evaluator.cpp @@ -128,6 +128,11 @@ struct proposal_operation_hardfork_visitor FC_ASSERT( block_time >= HARDFORK_1000_TIME, "event_update_status_operation not allowed yet!" ); } + void operator()(const vesting_balance_create_operation &vbco) const { + if(block_time < HARDFORK_GPOS_TIME) + FC_ASSERT( vbco.balance_type == vesting_balance_type::normal, "balance_type in vesting create not allowed yet!" ); + } + void operator()(const custom_permission_create_operation &v) const { FC_ASSERT( block_time >= HARDFORK_NFT_TIME, "custom_permission_create_operation not allowed yet!" ); } @@ -216,11 +221,6 @@ struct proposal_operation_hardfork_visitor FC_ASSERT( block_time >= HARDFORK_SON_TIME, "son_maintenance_operation not allowed yet!" ); } - void operator()(const vesting_balance_create_operation &vbco) const { - if(block_time < HARDFORK_GPOS_TIME) - FC_ASSERT( vbco.balance_type == vesting_balance_type::normal, "balance_type in vesting create not allowed yet!" ); - } - // loop and self visit in proposals void operator()(const proposal_create_operation &v) const { for (const op_wrapper &op : v.proposed_ops) @@ -246,7 +246,7 @@ void son_hardfork_visitor::operator()( const son_report_down_operation &v ) }); } -void_result proposal_create_evaluator::do_evaluate(const proposal_create_operation& o) +void_result proposal_create_evaluator::do_evaluate( const proposal_create_operation& o ) { try { const database& d = db(); auto block_time = d.head_block_time(); diff --git a/tests/app/main.cpp b/tests/app/main.cpp index c738187b..28b8a1fc 100644 --- a/tests/app/main.cpp +++ b/tests/app/main.cpp @@ -34,9 +34,6 @@ #include #include #include -#include -#include - #include #include diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp index a6a68149..b5ce1f55 100644 --- a/tests/common/database_fixture.cpp +++ b/tests/common/database_fixture.cpp @@ -188,8 +188,6 @@ database_fixture::database_fixture() mhplugin->plugin_startup(); bookieplugin->plugin_startup(); affiliateplugin->plugin_startup(); - // stats api requests affiliate_stats plugin from app, so add it to app plugin list - app.enable_plugin(affiliateplugin->plugin_name()); generate_block(); diff --git a/tests/common/genesis_file_util.hpp b/tests/common/genesis_file_util.hpp index 27a2080f..e058df02 100644 --- a/tests/common/genesis_file_util.hpp +++ b/tests/common/genesis_file_util.hpp @@ -1,5 +1,5 @@ #pragma once -#include + ///////// /// @brief forward declaration, using as a hack to generate a genesis.json file /// for testing