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

Fix list_active_son command output on deregistered SONs

Browse source
This commit is contained in:
serkixenos 2022-01-21 12:17:13 -04:00
parent b5a9a0101a
commit 0bcb0487a7
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/wallet/wallet.cpp
View file

@ -2201,13 +2201,10 @@ public:
std::vector<fc::optional<son_object>> son_objects = _remote_db->get_sons(son_ids); std::vector<fc::optional<son_object>> son_objects = _remote_db->get_sons(son_ids);
vector<std::string> owners; vector<std::string> owners;
for(auto obj: son_objects) for(auto obj: son_objects)
{
if (obj)
{ {
std::string acc_id = account_id_to_string(obj->son_account); std::string acc_id = account_id_to_string(obj->son_account);
owners.push_back(acc_id); owners.push_back(acc_id);
} }
}
vector< optional< account_object> > accs = _remote_db->get_accounts(owners); vector< optional< account_object> > accs = _remote_db->get_accounts(owners);
std::remove_if(son_objects.begin(), son_objects.end(), std::remove_if(son_objects.begin(), son_objects.end(),
[](const fc::optional<son_object>& obj) -> bool { return obj.valid(); }); [](const fc::optional<son_object>& obj) -> bool { return obj.valid(); });
@ -2216,9 +2213,7 @@ public:
std::inserter(result, result.end()), std::inserter(result, result.end()),
[](fc::optional<account_object>& acct, fc::optional<son_object> son) { [](fc::optional<account_object>& acct, fc::optional<son_object> son) {
FC_ASSERT(acct, "Invalid active SONs list in global properties."); FC_ASSERT(acct, "Invalid active SONs list in global properties.");
if (son.valid() && son->status != son_status::deregistered)
return std::make_pair<string, son_id_type>(string(acct->name), std::move(son->id)); return std::make_pair<string, son_id_type>(string(acct->name), std::move(son->id));
return std::make_pair<string, son_id_type>(string(acct->name), std::move(son_id_type()));
}); });
return result; return result;
} FC_CAPTURE_AND_RETHROW() } } FC_CAPTURE_AND_RETHROW() }