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

Merge branch 'bug/fix-list-active-sons' into 'develop'

Browse source 
Fix list_active_sons output

See merge request PBSA/peerplays!54
This commit is contained in:
serkixenos 2022-01-26 18:30:21 +00:00
commit 6f6811eec4
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/wallet/wallet.cpp
View file

@ -2202,11 +2202,8 @@ public:
vector<std::string> owners;
for(auto obj: son_objects)
{
if (obj)
{
std::string acc_id = account_id_to_string(obj->son_account);
owners.push_back(acc_id);
}
std::string acc_id = account_id_to_string(obj->son_account);
owners.push_back(acc_id);
}
vector< optional< account_object> > accs = _remote_db->get_accounts(owners);
std::remove_if(son_objects.begin(), son_objects.end(),
@ -2216,9 +2213,7 @@ public:
std::inserter(result, result.end()),
[](fc::optional<account_object>& acct, fc::optional<son_object> son) {
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_type()));
return std::make_pair<string, son_id_type>(string(acct->name), std::move(son->id));
});
return result;
} FC_CAPTURE_AND_RETHROW() }