Merge pull request #1073 from xiangxn/merge-impacted

merge impacted into db_notify

Author: oxarbitrage

libraries/app/CMakeLists.txt

@@ -6,7 +6,6 @@ add_library( graphene_app
              application.cpp
              util.cpp
              database_api.cpp
-             impacted.cpp
              plugin.cpp
              ${HEADERS}
              ${EGENESIS_HEADERS}

libraries/app/api.cpp

@@ -26,7 +26,6 @@
 #include <graphene/app/api.hpp>
 #include <graphene/app/api_access.hpp>
 #include <graphene/app/application.hpp>
-#include <graphene/app/impacted.hpp>
 #include <graphene/chain/database.hpp>
 #include <graphene/chain/get_config.hpp>
 #include <graphene/utilities/key_conversion.hpp>

libraries/app/impacted.cpp

@@ -14,6 +14,7 @@
 #include <graphene/chain/operation_history_object.hpp>
 #include <graphene/chain/vesting_balance_object.hpp>
 #include <graphene/chain/transaction_object.hpp>
+#include <graphene/chain/impacted.hpp>
 
 using namespace fc;
 using namespace graphene::chain;
@@ -257,19 +258,19 @@ struct get_impacted_account_visitor
    }
 };
 
-static void operation_get_impacted_accounts( const operation& op, flat_set<account_id_type>& result )
+void graphene::chain::operation_get_impacted_accounts( const operation& op, flat_set<account_id_type>& result )
 {
   get_impacted_account_visitor vtor = get_impacted_account_visitor( result );
   op.visit( vtor );
 }
 
-static void transaction_get_impacted_accounts( const transaction& tx, flat_set<account_id_type>& result )
+void graphene::chain::transaction_get_impacted_accounts( const transaction& tx, flat_set<account_id_type>& result )
 {
   for( const auto& op : tx.operations )
     operation_get_impacted_accounts( op, result );
 }
 
-static void get_relevant_accounts( const object* obj, flat_set<account_id_type>& accounts )
+void get_relevant_accounts( const object* obj, flat_set<account_id_type>& accounts )
 {
    if( obj->id.space() == protocol_ids )
    {

libraries/chain/db_notify.cpp

@@ -28,7 +28,7 @@
 #include <graphene/chain/protocol/transaction.hpp>
 #include <graphene/chain/protocol/types.hpp>
 
-namespace graphene { namespace app {
+namespace graphene { namespace chain {
 
 void operation_get_impacted_accounts(
    const graphene::chain::operation& op,
@@ -39,4 +39,4 @@ void transaction_get_impacted_accounts(
    fc::flat_set<graphene::chain::account_id_type>& result
    );
 
-} } // graphene::app
+} } // graphene::app

libraries/app/include/graphene/app/impacted.hpp renamed to libraries/chain/include/graphene/chain/impacted.hpp

@@ -24,7 +24,7 @@
 
 #include <graphene/account_history/account_history_plugin.hpp>
 
-#include <graphene/app/impacted.hpp>
+#include <graphene/chain/impacted.hpp>
 
 #include <graphene/chain/account_evaluator.hpp>
 #include <graphene/chain/account_object.hpp>
@@ -134,7 +134,7 @@ void account_history_plugin_impl::update_account_histories( const signed_block&
       if( op.op.which() == operation::tag< account_create_operation >::value )
          impacted.insert( op.result.get<object_id_type>() );
       else
-         graphene::app::operation_get_impacted_accounts( op.op, impacted );
+         graphene::chain::operation_get_impacted_accounts( op.op, impacted );
 
       for( auto& a : other )
          for( auto& item : a.account_auths )

libraries/plugins/account_history/account_history_plugin.cpp

@@ -24,7 +24,7 @@
 
 #include <graphene/elasticsearch/elasticsearch_plugin.hpp>
 
-#include <graphene/app/impacted.hpp>
+#include <graphene/chain/impacted.hpp>
 
 #include <graphene/chain/account_evaluator.hpp>
 #include <graphene/chain/account_object.hpp>
@@ -135,7 +135,7 @@ void elasticsearch_plugin_impl::update_account_histories( const signed_block& b
       if( op.op.which() == operation::tag< account_create_operation >::value )
          impacted.insert( op.result.get<object_id_type>() );
       else
-         graphene::app::operation_get_impacted_accounts( op.op, impacted );
+         graphene::chain::operation_get_impacted_accounts( op.op, impacted );
 
       for( auto& a : other )
          for( auto& item : a.account_auths )