Skip to content

Commit

Permalink
Merge pull request #140 from peerplays-network/feature/GRPH-111
Browse files Browse the repository at this point in the history
 Added get_asset_count API
  • Loading branch information
bobinson committed Sep 23, 2019
2 parents 857a30d + aa31de5 commit 1cb494e
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 0 deletions.
10 changes: 10 additions & 0 deletions libraries/app/database_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ class database_api_impl : public std::enable_shared_from_this<database_api_impl>
vector<optional<asset_object>> get_assets(const vector<asset_id_type>& asset_ids)const;
vector<asset_object> list_assets(const string& lower_bound_symbol, uint32_t limit)const;
vector<optional<asset_object>> lookup_asset_symbols(const vector<string>& symbols_or_ids)const;
uint64_t get_asset_count()const;

// Peerplays
vector<sport_object> list_sports() const;
Expand Down Expand Up @@ -1012,6 +1013,15 @@ vector<optional<asset_object>> database_api_impl::lookup_asset_symbols(const vec
return result;
}

uint64_t database_api::get_asset_count()const
{
return my->get_asset_count();
}

uint64_t database_api_impl::get_asset_count()const
{
return _db.get_index_type<asset_index>().indices().size();
}
////////////////////
// Lottery Assets //
////////////////////
Expand Down
7 changes: 7 additions & 0 deletions libraries/app/include/graphene/app/database_api.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,12 @@ class database_api
* This function has semantics identical to @ref get_objects
*/
vector<optional<asset_object>> lookup_asset_symbols(const vector<string>& symbols_or_ids)const;

/**
* @brief Get assets count
* @return The assets count
*/
uint64_t get_asset_count()const;

////////////////////
// Lottery Assets //
Expand Down Expand Up @@ -727,6 +733,7 @@ FC_API(graphene::app::database_api,
(get_assets)
(list_assets)
(lookup_asset_symbols)
(get_asset_count)

// Peerplays
(list_sports)
Expand Down
7 changes: 7 additions & 0 deletions libraries/wallet/include/graphene/wallet/wallet.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,12 @@ class wallet_api
* @returns the list of asset objects, ordered by symbol
*/
vector<asset_object> list_assets(const string& lowerbound, uint32_t limit)const;

/** Returns assets count registered on the blockchain.
*
* @returns assets count
*/
uint64_t get_asset_count()const;


vector<asset_object> get_lotteries( asset_id_type stop = asset_id_type(),
Expand Down Expand Up @@ -1925,6 +1931,7 @@ FC_API( graphene::wallet::wallet_api,
(list_accounts)
(list_account_balances)
(list_assets)
(get_asset_count)
(import_key)
(import_accounts)
(import_account_keys)
Expand Down
5 changes: 5 additions & 0 deletions libraries/wallet/wallet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3424,6 +3424,11 @@ vector<asset_object> wallet_api::list_assets(const string& lowerbound, uint32_t
return my->_remote_db->list_assets( lowerbound, limit );
}

uint64_t wallet_api::get_asset_count()const
{
return my->_remote_db->get_asset_count();
}

vector<asset_object> wallet_api::get_lotteries( asset_id_type stop,
unsigned limit,
asset_id_type start )const
Expand Down

0 comments on commit 1cb494e

Please sign in to comment.