Another account_name account_name #665

plugins/account_history_plugin/account_history_plugin.cpp

@@ -309,7 +309,7 @@ void account_history_plugin_impl::applied_block(const signed_block& block)
             for (const auto& account_name : trx.scope)
             {
                db.create<account_transaction_history_object>([&trx,&account_name](account_transaction_history_object& account_transaction_history) {
-                  account_transaction_history.account_name = account_name;
+                  account_transaction_history.name = account_name;
                   account_transaction_history.transaction_id = trx.id();
                });
             }

plugins/account_history_plugin/include/eos/account_history_plugin/account_history_plugin.hpp

@@ -42,7 +42,7 @@ public:
 
 
    struct get_transactions_params {
-      chain::account_name account_name;
+      name                account_name;
       optional<uint32_t>  skip_seq;
       optional<uint32_t>  num_seq;
    };
@@ -63,16 +63,16 @@ public:
       chain::public_key_type     public_key;
    };
    struct get_key_accounts_results {
-      vector<chain::account_name> account_names;
+      vector<name> account_names;
    };
    get_key_accounts_results get_key_accounts(const get_key_accounts_params& params) const;
 
 
    struct get_controlled_accounts_params {
-      chain::account_name     controlling_account;
+      name     controlling_account;
    };
    struct get_controlled_accounts_results {
-      vector<chain::account_name> controlled_accounts;
+      vector<name> controlled_accounts;
    };
    get_controlled_accounts_results get_controlled_accounts(const get_controlled_accounts_params& params) const;
 };

plugins/account_history_plugin/include/eos/account_history_plugin/account_transaction_history_object.hpp

@@ -29,7 +29,7 @@ class account_transaction_history_object : public chainbase::object<chain::accou
    OBJECT_CTOR(account_transaction_history_object)
 
    id_type                            id;
-   account_name                       account_name;
+   account_name                       name;
    transaction_id_type                transaction_id;
 };
 
@@ -40,10 +40,10 @@ using account_transaction_history_multi_index = chainbase::shared_multi_index_co
    account_transaction_history_object,
    indexed_by<
       ordered_unique<tag<by_id>, BOOST_MULTI_INDEX_MEMBER(account_transaction_history_object, account_transaction_history_object::id_type, id)>,
-      hashed_non_unique<tag<by_account_name>, BOOST_MULTI_INDEX_MEMBER(account_transaction_history_object, account_name, account_name), std::hash<account_name>>,
+      hashed_non_unique<tag<by_account_name>, BOOST_MULTI_INDEX_MEMBER(account_transaction_history_object, account_name, name), std::hash<account_name>>,
       hashed_unique<tag<by_account_name_trx_id>,
          composite_key< account_transaction_history_object,
-            member<account_transaction_history_object, account_name, &account_transaction_history_object::account_name>,
+            member<account_transaction_history_object, account_name, &account_transaction_history_object::name>,
             member<account_transaction_history_object, transaction_id_type, &account_transaction_history_object::transaction_id>
          >,
          composite_key_hash< std::hash<account_name>, std::hash<transaction_id_type> >
@@ -57,5 +57,5 @@ typedef chainbase::generic_index<account_transaction_history_multi_index> accoun
 
 CHAINBASE_SET_INDEX_TYPE( eosio::account_transaction_history_object, eosio::account_transaction_history_multi_index )
 
-FC_REFLECT( eosio::account_transaction_history_object, (account_name)(transaction_id) )
+FC_REFLECT( eosio::account_transaction_history_object, (name)(transaction_id) )