Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Remove by_account index from account_object #529

Browse source
This commit is contained in:
theoreticalbts 2016-01-21 10:29:54 -05:00
parent 600a06f57e
commit aa6d13b057
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/app/database_api.cpp
View file

@ -577,7 +577,7 @@ std::map<std::string, full_account> database_api_impl::get_full_accounts( const
// Add the account's balances // Add the account's balances
auto balance_range = _db.get_index_type<account_balance_index>().indices().get<by_account>().equal_range(account->id); auto balance_range = _db.get_index_type<account_balance_index>().indices().get<by_account_asset>().equal_range(boost::make_tuple(account->id));
//vector<account_balance_object> balances; //vector<account_balance_object> balances;
std::for_each(balance_range.first, balance_range.second, std::for_each(balance_range.first, balance_range.second,
[&acnt](const account_balance_object& balance) { [&acnt](const account_balance_object& balance) {
@ -711,7 +711,7 @@ vector<asset> database_api_impl::get_account_balances(account_id_type acnt, cons
{ {
// if the caller passes in an empty list of assets, return balances for all assets the account owns // if the caller passes in an empty list of assets, return balances for all assets the account owns
const account_balance_index& balance_index = _db.get_index_type<account_balance_index>(); const account_balance_index& balance_index = _db.get_index_type<account_balance_index>();
auto range = balance_index.indices().get<by_account>().equal_range(acnt); auto range = balance_index.indices().get<by_account_asset>().equal_range(boost::make_tuple(acnt));
for (const account_balance_object& balance : boost::make_iterator_range(range.first, range.second)) for (const account_balance_object& balance : boost::make_iterator_range(range.first, range.second))
result.push_back(asset(balance.get_balance())); result.push_back(asset(balance.get_balance()));
} }

4
libraries/chain/db_block.cpp
View file

@ -631,8 +631,8 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx
ptrx.operation_results = std::move(eval_state.operation_results); ptrx.operation_results = std::move(eval_state.operation_results);
//Make sure the temp account has no non-zero balances //Make sure the temp account has no non-zero balances
const auto& index = get_index_type<account_balance_index>().indices().get<by_account>(); const auto& index = get_index_type<account_balance_index>().indices().get<by_account_asset>();
auto range = index.equal_range(GRAPHENE_TEMP_ACCOUNT); auto range = index.equal_range( boost::make_tuple( GRAPHENE_TEMP_ACCOUNT ) );
std::for_each(range.first, range.second, [](const account_balance_object& b) { FC_ASSERT(b.balance == 0); }); std::for_each(range.first, range.second, [](const account_balance_object& b) { FC_ASSERT(b.balance == 0); });
return ptrx; return ptrx;

2
libraries/chain/include/graphene/chain/account_object.hpp
View file

@ -290,7 +290,6 @@ namespace graphene { namespace chain {
}; };
struct by_asset; struct by_asset;
struct by_account;
struct by_account_asset; struct by_account_asset;
/** /**
* @ingroup object_index * @ingroup object_index
@ -304,7 +303,6 @@ namespace graphene { namespace chain {
member<account_balance_object, account_id_type, &account_balance_object::owner>, member<account_balance_object, account_id_type, &account_balance_object::owner>,
member<account_balance_object, asset_id_type, &account_balance_object::asset_type> > member<account_balance_object, asset_id_type, &account_balance_object::asset_type> >
>, >,
ordered_non_unique< tag<by_account>, member<account_balance_object, account_id_type, &account_balance_object::owner> >,
ordered_non_unique< tag<by_asset>, member<account_balance_object, asset_id_type, &account_balance_object::asset_type> > ordered_non_unique< tag<by_asset>, member<account_balance_object, asset_id_type, &account_balance_object::asset_type> >
> >
> account_balance_object_multi_index_type; > account_balance_object_multi_index_type;