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

Code formatting

Browse source
This commit is contained in:
serkixenos 2022-02-15 10:48:52 -04:00
parent 050c0b27e5
commit 8be4dd5e3c
2 changed files with 90 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

194
libraries/app/database_api.cpp
View file

@ -52,27 +52,19 @@ template class fc::api<graphene::app::database_api>;
namespace graphene { namespace app { namespace graphene { namespace app {
template<class T> template <class T>
optional<T> maybe_id( const string& name_or_id ) optional<T> maybe_id(const string &name_or_id) {
{ if (std::isdigit(name_or_id.front())) {
if( std::isdigit( name_or_id.front() ) ) try {
{
try
{
return fc::variant(name_or_id, 1).as<T>(1); return fc::variant(name_or_id, 1).as<T>(1);
} } catch (const fc::exception &) { // not an ID
catch (const fc::exception&)
{ // not an ID
} }
} }
return optional<T>(); return optional<T>();
} }
std::string object_id_to_string(object_id_type id) std::string object_id_to_string(object_id_type id) {
{ std::string object_id = fc::to_string(id.space()) + "." + fc::to_string(id.type()) + "." + fc::to_string(id.instance());
std::string object_id = fc::to_string(id.space())
+ "." + fc::to_string(id.type())
+ "." + fc::to_string(id.instance());
return object_id; return object_id;
} }
@ -211,17 +203,16 @@ public:
// Votes // Votes
vector<variant> lookup_vote_ids(const vector<vote_id_type> &votes) const; vector<variant> lookup_vote_ids(const vector<vote_id_type> &votes) const;
vector<vote_id_type> get_votes_ids(const string &account_name_or_id) const; vector<vote_id_type> get_votes_ids(const string &account_name_or_id) const;
template<typename IndexType, typename Tag> template <typename IndexType, typename Tag>
vector<variant> get_votes_objects(const vector<vote_id_type> &votes, unsigned int variant_max_depth = 1) const vector<variant> get_votes_objects(const vector<vote_id_type> &votes, unsigned int variant_max_depth = 1) const {
{ static_assert(std::is_base_of<index, IndexType>::value, "Type must be an index type");
static_assert( std::is_base_of<index,IndexType>::value, "Type must be an index type" );
vector<variant> result; vector<variant> result;
const auto &idx = _db.get_index_type<IndexType>().indices().template get<Tag>(); const auto &idx = _db.get_index_type<IndexType>().indices().template get<Tag>();
for (auto id : votes) { for (auto id : votes) {
auto itr = idx.find(id); auto itr = idx.find(id);
if (itr != idx.end()) if (itr != idx.end())
result.emplace_back(variant(*itr,variant_max_depth)); result.emplace_back(variant(*itr, variant_max_depth));
} }
return result; return result;
} }
@ -2129,8 +2120,7 @@ vector<vote_id_type> database_api_impl::get_votes_ids(const string &account_name
const account_object *account = get_account_from_string(account_name_or_id); const account_object *account = get_account_from_string(account_name_or_id);
//! Iterate throug votes and fill vector //! Iterate throug votes and fill vector
for( const auto& vote : account->options.votes ) for (const auto &vote : account->options.votes) {
{
result.emplace_back(vote); result.emplace_back(vote);
} }
@ -2140,16 +2130,16 @@ vector<vote_id_type> database_api_impl::get_votes_ids(const string &account_name
votes_info database_api_impl::get_votes(const string &account_name_or_id) const { votes_info database_api_impl::get_votes(const string &account_name_or_id) const {
votes_info result; votes_info result;
const auto& votes_ids = get_votes_ids(account_name_or_id); const auto &votes_ids = get_votes_ids(account_name_or_id);
const auto& committee_ids = get_votes_objects<committee_member_index, by_vote_id>(votes_ids); const auto &committee_ids = get_votes_objects<committee_member_index, by_vote_id>(votes_ids);
const auto& witness_ids = get_votes_objects<witness_index, by_vote_id>(votes_ids); const auto &witness_ids = get_votes_objects<witness_index, by_vote_id>(votes_ids);
const auto& for_worker_ids = get_votes_objects<worker_index, by_vote_for>(votes_ids); const auto &for_worker_ids = get_votes_objects<worker_index, by_vote_for>(votes_ids);
const auto& against_worker_ids = get_votes_objects<worker_index, by_vote_against>(votes_ids); const auto &against_worker_ids = get_votes_objects<worker_index, by_vote_against>(votes_ids);
const auto& son_ids = get_votes_objects<son_index, by_vote_id>(votes_ids, 5); const auto &son_ids = get_votes_objects<son_index, by_vote_id>(votes_ids, 5);
//! Fill votes info //! Fill votes info
if(!committee_ids.empty()) { if (!committee_ids.empty()) {
vector< votes_info_object<committee_member_id_type> > votes_for_committee_members; vector<votes_info_object<committee_member_id_type>> votes_for_committee_members;
votes_for_committee_members.reserve(committee_ids.size()); votes_for_committee_members.reserve(committee_ids.size());
for (const auto &committee : committee_ids) { for (const auto &committee : committee_ids) {
const auto &committee_obj = committee.as<committee_member_object>(2); const auto &committee_obj = committee.as<committee_member_object>(2);
@ -2158,8 +2148,8 @@ votes_info database_api_impl::get_votes(const string &account_name_or_id) const
result.votes_for_committee_members = std::move(votes_for_committee_members); result.votes_for_committee_members = std::move(votes_for_committee_members);
} }
if(!witness_ids.empty()) { if (!witness_ids.empty()) {
vector< votes_info_object<witness_id_type> > votes_for_witnesses; vector<votes_info_object<witness_id_type>> votes_for_witnesses;
votes_for_witnesses.reserve(witness_ids.size()); votes_for_witnesses.reserve(witness_ids.size());
for (const auto &witness : witness_ids) { for (const auto &witness : witness_ids) {
const auto &witness_obj = witness.as<witness_object>(2); const auto &witness_obj = witness.as<witness_object>(2);
@ -2168,8 +2158,8 @@ votes_info database_api_impl::get_votes(const string &account_name_or_id) const
result.votes_for_witnesses = std::move(votes_for_witnesses); result.votes_for_witnesses = std::move(votes_for_witnesses);
} }
if(!for_worker_ids.empty()) { if (!for_worker_ids.empty()) {
vector< votes_info_object<worker_id_type> > votes_for_workers; vector<votes_info_object<worker_id_type>> votes_for_workers;
votes_for_workers.reserve(for_worker_ids.size()); votes_for_workers.reserve(for_worker_ids.size());
for (const auto &for_worker : for_worker_ids) { for (const auto &for_worker : for_worker_ids) {
const auto &for_worker_obj = for_worker.as<worker_object>(2); const auto &for_worker_obj = for_worker.as<worker_object>(2);
@ -2178,8 +2168,8 @@ votes_info database_api_impl::get_votes(const string &account_name_or_id) const
result.votes_for_workers = std::move(votes_for_workers); result.votes_for_workers = std::move(votes_for_workers);
} }
if(!against_worker_ids.empty()) { if (!against_worker_ids.empty()) {
vector< votes_info_object<worker_id_type> > votes_against_workers; vector<votes_info_object<worker_id_type>> votes_against_workers;
votes_against_workers.reserve(against_worker_ids.size()); votes_against_workers.reserve(against_worker_ids.size());
for (const auto &against_worker : against_worker_ids) { for (const auto &against_worker : against_worker_ids) {
const auto &against_worker_obj = against_worker.as<worker_object>(2); const auto &against_worker_obj = against_worker.as<worker_object>(2);
@ -2188,8 +2178,8 @@ votes_info database_api_impl::get_votes(const string &account_name_or_id) const
result.votes_against_workers = std::move(votes_against_workers); result.votes_against_workers = std::move(votes_against_workers);
} }
if(!son_ids.empty()) { if (!son_ids.empty()) {
vector< votes_info_object<son_id_type> > votes_for_sons; vector<votes_info_object<son_id_type>> votes_for_sons;
votes_for_sons.reserve(son_ids.size()); votes_for_sons.reserve(son_ids.size());
for (const auto &son : son_ids) { for (const auto &son : son_ids) {
const auto &son_obj = son.as<son_object>(6); const auto &son_obj = son.as<son_object>(6);
@ -2205,10 +2195,9 @@ vector<account_object> database_api_impl::get_voters_by_id(const vote_id_type &v
vector<account_object> result; vector<account_object> result;
//! We search all accounts that have voted for this vote_id //! We search all accounts that have voted for this vote_id
const auto& account_index = _db.get_index_type<graphene::chain::account_index>().indices().get<by_id>(); const auto &account_index = _db.get_index_type<graphene::chain::account_index>().indices().get<by_id>();
for( const auto& account: account_index ) for (const auto &account : account_index) {
{ if (account.options.votes.count(vote_id) != 0)
if(account.options.votes.count(vote_id) != 0)
result.emplace_back(account); result.emplace_back(account);
} }
@ -2223,83 +2212,78 @@ voters_info database_api_impl::get_voters(const string &account_name_or_id) cons
std::string owner_account_id; std::string owner_account_id;
//! Check if we have account by name //! Check if we have account by name
const auto& account_object = get_account_by_name(account_name_or_id); const auto &account_object = get_account_by_name(account_name_or_id);
if(account_object) { if (account_object) {
//! It is account //! It is account
owner_account_id = object_id_to_string( account_object->get_id() ); owner_account_id = object_id_to_string(account_object->get_id());
owner_account_found = true; owner_account_found = true;
} } else {
else {
//! Check if we have account id //! Check if we have account id
const auto& account_id = maybe_id<account_id_type>(account_name_or_id); const auto &account_id = maybe_id<account_id_type>(account_name_or_id);
if(account_id) { if (account_id) {
//! It may be account id //! It may be account id
const auto& account_objects = get_accounts({account_name_or_id}); const auto &account_objects = get_accounts({account_name_or_id});
if(!account_objects.empty()){ if (!account_objects.empty()) {
const auto& account_object = account_objects.front(); const auto &account_object = account_objects.front();
if(account_object) { if (account_object) {
//! It is account object //! It is account object
owner_account_id = object_id_to_string( account_object->get_id() ); owner_account_id = object_id_to_string(account_object->get_id());
owner_account_found = true; owner_account_found = true;
} }
} }
} } else {
else {
//! Check if we have committee member id //! Check if we have committee member id
const auto& committee_member_id = maybe_id<committee_member_id_type>(account_name_or_id); const auto &committee_member_id = maybe_id<committee_member_id_type>(account_name_or_id);
if(committee_member_id) { if (committee_member_id) {
//! It may be committee member id //! It may be committee member id
const auto& committee_member_objects = get_committee_members({*committee_member_id}); const auto &committee_member_objects = get_committee_members({*committee_member_id});
if(!committee_member_objects.empty()){ if (!committee_member_objects.empty()) {
const auto& committee_member_object = committee_member_objects.front(); const auto &committee_member_object = committee_member_objects.front();
if(committee_member_object) { if (committee_member_object) {
//! It is committee member object //! It is committee member object
owner_account_id = object_id_to_string( committee_member_object->committee_member_account ); owner_account_id = object_id_to_string(committee_member_object->committee_member_account);
owner_account_found = true; owner_account_found = true;
} }
} }
} } else {
else {
//! Check if we have witness id //! Check if we have witness id
const auto& witness_id = maybe_id<witness_id_type>(account_name_or_id); const auto &witness_id = maybe_id<witness_id_type>(account_name_or_id);
if(witness_id) { if (witness_id) {
//! It may be witness id //! It may be witness id
const auto& witness_objects = get_witnesses({*witness_id}); const auto &witness_objects = get_witnesses({*witness_id});
if(!witness_objects.empty()){ if (!witness_objects.empty()) {
const auto& witness_object = witness_objects.front(); const auto &witness_object = witness_objects.front();
if(witness_object) { if (witness_object) {
//! It is witness object //! It is witness object
owner_account_id = object_id_to_string( witness_object->witness_account ); owner_account_id = object_id_to_string(witness_object->witness_account);
owner_account_found = true; owner_account_found = true;
} }
} }
} } else {
else {
//! Check if we have worker id //! Check if we have worker id
const auto& worker_id = maybe_id<worker_id_type>(account_name_or_id); const auto &worker_id = maybe_id<worker_id_type>(account_name_or_id);
if(worker_id) { if (worker_id) {
//! It may be worker id //! It may be worker id
const auto& worker_objects = get_workers({*worker_id}); const auto &worker_objects = get_workers({*worker_id});
if(!worker_objects.empty()){ if (!worker_objects.empty()) {
const auto& worker_object = worker_objects.front(); const auto &worker_object = worker_objects.front();
if(worker_object) { if (worker_object) {
//! It is worker object //! It is worker object
owner_account_id = object_id_to_string( worker_object->worker_account ); owner_account_id = object_id_to_string(worker_object->worker_account);
owner_account_found = true; owner_account_found = true;
} }
} }
} } else {
else {
//! Check if we have son id //! Check if we have son id
const auto& son_id = maybe_id<son_id_type>(account_name_or_id); const auto &son_id = maybe_id<son_id_type>(account_name_or_id);
if(son_id) { if (son_id) {
//! It may be son id //! It may be son id
const auto& son_objects = get_sons({*son_id}); const auto &son_objects = get_sons({*son_id});
if(!son_objects.empty()){ if (!son_objects.empty()) {
const auto& son_object = son_objects.front(); const auto &son_object = son_objects.front();
if(son_object) { if (son_object) {
//! It is son object //! It is son object
owner_account_id = object_id_to_string( son_object->son_account ); owner_account_id = object_id_to_string(son_object->son_account);
owner_account_found = true; owner_account_found = true;
} }
} }
@ -2311,41 +2295,41 @@ voters_info database_api_impl::get_voters(const string &account_name_or_id) cons
} }
//! We didn't find who it was //! We didn't find who it was
if(!owner_account_found) if (!owner_account_found)
FC_THROW_EXCEPTION(database_query_exception, "Wrong account_name_or_id: ${account_name_or_id}", ("account_name_or_id", account_name_or_id)); FC_THROW_EXCEPTION(database_query_exception, "Wrong account_name_or_id: ${account_name_or_id}", ("account_name_or_id", account_name_or_id));
//! Fill voters_info //! Fill voters_info
const auto& committee_member_object = get_committee_member_by_account(owner_account_id); const auto &committee_member_object = get_committee_member_by_account(owner_account_id);
const auto& witness_object = get_witness_by_account(owner_account_id); const auto &witness_object = get_witness_by_account(owner_account_id);
const auto& worker_objects = get_workers_by_account(owner_account_id); const auto &worker_objects = get_workers_by_account(owner_account_id);
const auto& son_object = get_son_by_account(owner_account_id); const auto &son_object = get_son_by_account(owner_account_id);
//! Info for committee member voters //! Info for committee member voters
if(committee_member_object) { if (committee_member_object) {
const auto& committee_member_voters = get_voters_by_id(committee_member_object->vote_id); const auto &committee_member_voters = get_voters_by_id(committee_member_object->vote_id);
voters_info_object voters_for_committee_member; voters_info_object voters_for_committee_member;
voters_for_committee_member.vote_id = committee_member_object->vote_id; voters_for_committee_member.vote_id = committee_member_object->vote_id;
voters_for_committee_member.voters.reserve(committee_member_voters.size()); voters_for_committee_member.voters.reserve(committee_member_voters.size());
for(const auto& voter: committee_member_voters) { for (const auto &voter : committee_member_voters) {
voters_for_committee_member.voters.emplace_back(voter.get_id()); voters_for_committee_member.voters.emplace_back(voter.get_id());
} }
result.voters_for_committee_member = std::move(voters_for_committee_member); result.voters_for_committee_member = std::move(voters_for_committee_member);
} }
//! Info for witness voters //! Info for witness voters
if(witness_object) { if (witness_object) {
const auto& witness_voters = get_voters_by_id(witness_object->vote_id); const auto &witness_voters = get_voters_by_id(witness_object->vote_id);
voters_info_object voters_for_witness; voters_info_object voters_for_witness;
voters_for_witness.vote_id = witness_object->vote_id; voters_for_witness.vote_id = witness_object->vote_id;
voters_for_witness.voters.reserve(witness_voters.size()); voters_for_witness.voters.reserve(witness_voters.size());
for(const auto& voter: witness_voters) { for (const auto &voter : witness_voters) {
voters_for_witness.voters.emplace_back(voter.get_id()); voters_for_witness.voters.emplace_back(voter.get_id());
} }
result.voters_for_witness = std::move(voters_for_witness); result.voters_for_witness = std::move(voters_for_witness);
} }
//! Info for worker voters //! Info for worker voters
if(!worker_objects.empty()) { if (!worker_objects.empty()) {
vector<voters_info_object> voters_for_workers(worker_objects.size()); vector<voters_info_object> voters_for_workers(worker_objects.size());
vector<voters_info_object> voters_against_workers(worker_objects.size()); vector<voters_info_object> voters_against_workers(worker_objects.size());
for (const auto &worker_object : worker_objects) { for (const auto &worker_object : worker_objects) {
@ -2372,12 +2356,12 @@ voters_info database_api_impl::get_voters(const string &account_name_or_id) cons
} }
//! Info for son voters //! Info for son voters
if(son_object) { if (son_object) {
const auto& son_voters = get_voters_by_id(son_object->vote_id); const auto &son_voters = get_voters_by_id(son_object->vote_id);
voters_info_object voters_for_son; voters_info_object voters_for_son;
voters_for_son.vote_id = son_object->vote_id; voters_for_son.vote_id = son_object->vote_id;
voters_for_son.voters.reserve(son_voters.size()); voters_for_son.voters.reserve(son_voters.size());
for(const auto& voter: son_voters) { for (const auto &voter : son_voters) {
voters_for_son.voters.emplace_back(voter.get_id()); voters_for_son.voters.emplace_back(voter.get_id());
} }
result.voters_for_son = std::move(voters_for_son); result.voters_for_son = std::move(voters_for_son);

2
libraries/app/include/graphene/app/database_api.hpp
View file

@ -56,8 +56,8 @@
#include <graphene/chain/custom_permission_object.hpp> #include <graphene/chain/custom_permission_object.hpp>
#include <graphene/chain/nft_object.hpp> #include <graphene/chain/nft_object.hpp>
#include <graphene/chain/offer_object.hpp> #include <graphene/chain/offer_object.hpp>
#include <graphene/chain/votes_info.hpp>
#include <graphene/chain/voters_info.hpp> #include <graphene/chain/voters_info.hpp>
#include <graphene/chain/votes_info.hpp>
#include <graphene/market_history/market_history_plugin.hpp> #include <graphene/market_history/market_history_plugin.hpp>