Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rpc: Fix "cpid" field in "beaconconvergence" RPC output #1750

Merged
merged 1 commit into from
Jun 22, 2020
Merged

rpc: Fix "cpid" field in "beaconconvergence" RPC output #1750

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions src/rpcblockchain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,6 @@ UniValue beaconreport(const UniValue& params, bool fHelp)

for (const auto& beacon_pair : active_beacons)
{

UniValue entry(UniValue::VOBJ);

entry.pushKV("cpid", beacon_pair.first.ToString());
Expand All @@ -773,34 +772,31 @@ UniValue beaconconvergence(const UniValue& params, bool fHelp)

UniValue results(UniValue::VOBJ);

std::vector<std::pair<NN::Cpid, NN::Beacon>> active_beacons;

UniValue verified_from_global(UniValue::VARR);

ScraperPendingBeaconMap verified_beacons_from_global = GetVerifiedBeaconsForReport(true);

for (const auto&verified_beacon_pair : verified_beacons_from_global)
for (const auto& verified_beacon_pair : verified_beacons_from_global)
{
UniValue entry(UniValue::VOBJ);

entry.pushKV("cpid", verified_beacon_pair.first);
entry.pushKV("cpid", verified_beacon_pair.second.cpid);
entry.pushKV("verification_code", verified_beacon_pair.first);
entry.pushKV("timestamp", verified_beacon_pair.second.timestamp);

verified_from_global.push_back(entry);
}

results.pushKV("verified beacons from scraper global", verified_from_global);


UniValue verified_from_convergence(UniValue::VARR);

ScraperPendingBeaconMap verified_beacons_from_convergence = GetVerifiedBeaconsForReport(false);

for (const auto&verified_beacon_pair : verified_beacons_from_convergence)
for (const auto& verified_beacon_pair : verified_beacons_from_convergence)
{
UniValue entry(UniValue::VOBJ);

entry.pushKV("cpid", verified_beacon_pair.first);
entry.pushKV("cpid", verified_beacon_pair.second.cpid);
entry.pushKV("verification_code", verified_beacon_pair.first);
entry.pushKV("timestamp", verified_beacon_pair.second.timestamp);

verified_from_convergence.push_back(entry);
Expand All @@ -809,15 +805,14 @@ UniValue beaconconvergence(const UniValue& params, bool fHelp)
results.pushKV("verified beacons from latest convergence", verified_from_convergence);

UniValue pending(UniValue::VARR);

ScraperPendingBeaconMap pending_beacons = GetPendingBeaconsForReport();

for (const auto& beacon_pair : pending_beacons)
{
UniValue entry(UniValue::VOBJ);

entry.pushKV("cpid", beacon_pair.second.cpid);
entry.pushKV("address", beacon_pair.first);
entry.pushKV("verification_code", beacon_pair.first);
entry.pushKV("timestamp", beacon_pair.second.timestamp);

pending.push_back(entry);
Expand Down Expand Up @@ -852,7 +847,6 @@ UniValue pendingbeaconreport(const UniValue& params, bool fHelp)

for (const auto& pending_beacon_pair : pending_beacons)
{

UniValue entry(UniValue::VOBJ);

entry.pushKV("cpid", pending_beacon_pair.second.m_cpid.ToString());
Expand Down