From 38ec5537734cb26bf8aeb63863c5bac77e101f97 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Thu, 19 Sep 2019 13:22:46 -0300 Subject: [PATCH] remove member from operation names --- libraries/app/impacted.cpp | 4 ++-- libraries/chain/db_init.cpp | 5 ++--- libraries/chain/db_notify.cpp | 4 ++-- .../graphene/chain/protocol/operations.hpp | 4 ++-- .../include/graphene/chain/protocol/son.hpp | 12 ++++++------ .../include/graphene/chain/son_evaluator.hpp | 16 ++++++++-------- libraries/chain/son_evaluator.cpp | 8 ++++---- tests/tests/son_operations_tests.cpp | 8 ++++---- 8 files changed, 30 insertions(+), 31 deletions(-) diff --git a/libraries/app/impacted.cpp b/libraries/app/impacted.cpp index 1b7797ff..c67f220f 100644 --- a/libraries/app/impacted.cpp +++ b/libraries/app/impacted.cpp @@ -282,10 +282,10 @@ struct get_impacted_account_visitor _impacted.insert( op.affiliate ); } void operator()( const affiliate_referral_payout_operation& op ) { } - void operator()( const son_member_create_operation& op ){ + void operator()( const son_create_operation& op ){ _impacted.insert( op.owner_account ); } - void operator()( const son_member_delete_operation& op ){ + void operator()( const son_delete_operation& op ){ _impacted.insert( op.owner_account ); } }; diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 647ffb5f..4f305950 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -237,9 +237,8 @@ void database::initialize_evaluators() register_evaluator(); register_evaluator(); register_evaluator(); - - register_evaluator(); - register_evaluator(); + register_evaluator(); + register_evaluator(); } void database::initialize_indexes() diff --git a/libraries/chain/db_notify.cpp b/libraries/chain/db_notify.cpp index 2f3d89c3..de4f57b4 100644 --- a/libraries/chain/db_notify.cpp +++ b/libraries/chain/db_notify.cpp @@ -269,10 +269,10 @@ struct get_impacted_account_visitor _impacted.insert( op.affiliate ); } void operator()( const affiliate_referral_payout_operation& op ) { } - void operator()( const son_member_create_operation& op ) { + void operator()( const son_create_operation& op ) { _impacted.insert( op.owner_account ); } - void operator()( const son_member_delete_operation& op ) { + void operator()( const son_delete_operation& op ) { _impacted.insert( op.owner_account ); } }; diff --git a/libraries/chain/include/graphene/chain/protocol/operations.hpp b/libraries/chain/include/graphene/chain/protocol/operations.hpp index 6760791f..5259c0da 100644 --- a/libraries/chain/include/graphene/chain/protocol/operations.hpp +++ b/libraries/chain/include/graphene/chain/protocol/operations.hpp @@ -131,8 +131,8 @@ namespace graphene { namespace chain { event_group_delete_operation, affiliate_payout_operation, // VIRTUAL affiliate_referral_payout_operation, // VIRTUAL - son_member_create_operation, - son_member_delete_operation + son_create_operation, + son_delete_operation > operation; /// @} // operations group diff --git a/libraries/chain/include/graphene/chain/protocol/son.hpp b/libraries/chain/include/graphene/chain/protocol/son.hpp index 700dc5fc..eb355433 100644 --- a/libraries/chain/include/graphene/chain/protocol/son.hpp +++ b/libraries/chain/include/graphene/chain/protocol/son.hpp @@ -3,7 +3,7 @@ namespace graphene { namespace chain { - struct son_member_create_operation : public base_operation + struct son_create_operation : public base_operation { struct fee_parameters_type { uint64_t fee = 0; }; @@ -15,7 +15,7 @@ namespace graphene { namespace chain { share_type calculate_fee(const fee_parameters_type& k)const { return 0; } }; - struct son_member_delete_operation : public base_operation + struct son_delete_operation : public base_operation { struct fee_parameters_type { uint64_t fee = 0; }; @@ -28,8 +28,8 @@ namespace graphene { namespace chain { } } // namespace graphene::chain -FC_REFLECT( graphene::chain::son_member_create_operation::fee_parameters_type, (fee) ) -FC_REFLECT( graphene::chain::son_member_create_operation, (fee)(owner_account)(url) ) +FC_REFLECT( graphene::chain::son_create_operation::fee_parameters_type, (fee) ) +FC_REFLECT( graphene::chain::son_create_operation, (fee)(owner_account)(url) ) -FC_REFLECT( graphene::chain::son_member_delete_operation::fee_parameters_type, (fee) ) -FC_REFLECT( graphene::chain::son_member_delete_operation, (fee)(owner_account) ) +FC_REFLECT( graphene::chain::son_delete_operation::fee_parameters_type, (fee) ) +FC_REFLECT( graphene::chain::son_delete_operation, (fee)(owner_account) ) diff --git a/libraries/chain/include/graphene/chain/son_evaluator.hpp b/libraries/chain/include/graphene/chain/son_evaluator.hpp index 57b879b6..43cfd0fb 100644 --- a/libraries/chain/include/graphene/chain/son_evaluator.hpp +++ b/libraries/chain/include/graphene/chain/son_evaluator.hpp @@ -4,22 +4,22 @@ namespace graphene { namespace chain { -class create_son_member_evaluator : public evaluator +class create_son_evaluator : public evaluator { public: - typedef son_member_create_operation operation_type; + typedef son_create_operation operation_type; - void_result do_evaluate(const son_member_create_operation& o); - object_id_type do_apply(const son_member_create_operation& o); + void_result do_evaluate(const son_create_operation& o); + object_id_type do_apply(const son_create_operation& o); }; -class delete_son_member_evaluator : public evaluator +class delete_son_evaluator : public evaluator { public: - typedef son_member_delete_operation operation_type; + typedef son_delete_operation operation_type; - void_result do_evaluate(const son_member_delete_operation& o); - void_result do_apply(const son_member_delete_operation& o); + void_result do_evaluate(const son_delete_operation& o); + void_result do_apply(const son_delete_operation& o); }; } } // namespace graphene::chain diff --git a/libraries/chain/son_evaluator.cpp b/libraries/chain/son_evaluator.cpp index b469a0de..a5551a64 100644 --- a/libraries/chain/son_evaluator.cpp +++ b/libraries/chain/son_evaluator.cpp @@ -5,13 +5,13 @@ namespace graphene { namespace chain { -void_result create_son_member_evaluator::do_evaluate(const son_member_create_operation& op) +void_result create_son_evaluator::do_evaluate(const son_create_operation& op) { try{ FC_ASSERT(db().get(op.owner_account).is_lifetime_member(), "Only Lifetime members may register a SON."); return void_result(); } FC_CAPTURE_AND_RETHROW( (op) ) } -object_id_type create_son_member_evaluator::do_apply(const son_member_create_operation& op) +object_id_type create_son_evaluator::do_apply(const son_create_operation& op) { try { vote_id_type vote_id; db().modify(db().get_global_properties(), [&vote_id](global_property_object& p) { @@ -26,7 +26,7 @@ object_id_type create_son_member_evaluator::do_apply(const son_member_create_ope return new_son_object.id; } FC_CAPTURE_AND_RETHROW( (op) ) } -void_result delete_son_member_evaluator::do_evaluate(const son_member_delete_operation& op) +void_result delete_son_evaluator::do_evaluate(const son_delete_operation& op) { try { database& d = db(); const auto& idx = d.get_index_type().indices().get(); @@ -34,7 +34,7 @@ void_result delete_son_member_evaluator::do_evaluate(const son_member_delete_ope return void_result(); } FC_CAPTURE_AND_RETHROW( (op) ) } -void_result delete_son_member_evaluator::do_apply(const son_member_delete_operation& op) +void_result delete_son_evaluator::do_apply(const son_delete_operation& op) { try { const auto& idx = db().get_index_type().indices().get(); db().remove(*idx.find(op.owner_account)); diff --git a/tests/tests/son_operations_tests.cpp b/tests/tests/son_operations_tests.cpp index 45ff8a4e..16ff197f 100644 --- a/tests/tests/son_operations_tests.cpp +++ b/tests/tests/son_operations_tests.cpp @@ -10,7 +10,7 @@ using namespace graphene::chain; using namespace graphene::chain::test; -class test_create_son_member_evaluator: public create_son_member_evaluator { +class test_create_son_member_evaluator: public create_son_evaluator { public: test_create_son_member_evaluator( database& link_db ): ptr_trx_state( new transaction_evaluation_state( &link_db ) ) @@ -20,7 +20,7 @@ public: std::unique_ptr ptr_trx_state; }; -class test_delete_son_member_evaluator: public delete_son_member_evaluator { +class test_delete_son_member_evaluator: public delete_son_evaluator { public: test_delete_son_member_evaluator( database& link_db ): ptr_trx_state( new transaction_evaluation_state( &link_db ) ) @@ -35,7 +35,7 @@ BOOST_FIXTURE_TEST_SUITE( son_operation_tests, database_fixture ) BOOST_AUTO_TEST_CASE( create_son_test ){ std::string test_url = "https://create_son_test"; test_create_son_member_evaluator test_eval( db ); - son_member_create_operation op; + son_create_operation op; op.owner_account = account_id_type(1); op.url = test_url; @@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE( delete_son_test ){ INVOKE(create_son_test); test_delete_son_member_evaluator test_eval( db ); - son_member_delete_operation delete_op; + son_delete_operation delete_op; delete_op.owner_account = account_id_type(1); BOOST_CHECK_NO_THROW( test_eval.do_evaluate( delete_op ) ); test_eval.do_apply( delete_op );