Skip to content

beacon: Tweak BeaconRegistry::Revert #2020

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

Merged
merged 1 commit into from
Feb 25, 2021
Merged

beacon: Tweak BeaconRegistry::Revert #2020

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
21 changes: 4 additions & 17 deletions src/gridcoin/beacon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,26 +582,15 @@ void BeaconRegistry::Revert(const ContractContext& ctx)

// If the beacon is a renewal, it will have been put directly into the active beacons map with a status
// of RENEWAL. m_beacons is a map keyed by CPID, so therefore there can be only one record in m_beacons that
// corresponds to the renewed beacon to be deleted.
// corresponds to the renewed beacon to be deleted. It also must be in a status of renewal to be reverted as a
// renewal. Direct add v1 contracts are directly reverted when they are gotten to above.
auto iter = m_beacons.find(payload->m_cpid);

// The beacon exists and has a valid prev beacon hash...
if (iter != m_beacons.end())
// The beacon exists, has a valid prev beacon hash, and is a renewal...
if (iter != m_beacons.end() && iter->second->m_status == BeaconStatusForStorage::RENEWAL)
{
Beacon_ptr renewal = iter->second;

// There had been not be a non-renewal beacon in here at this point because the version 1 contracts
// were handled already above (which are the direct to active from ADD action).
if (renewal->m_status != BeaconStatusForStorage::RENEWAL)
{
error("%s: Transaction hash %s: Beacon to revert for cpid %s in m_beacons map for renewal reversion "
"is not in status of RENEWAL. Statis is %i.",
__func__,
ctx.m_tx.GetHash().GetHex(),
payload->m_cpid.ToString(),
renewal->m_status.Raw());
}

// Check that the identified beacon hash corresponds to the beacon in the transaction context.
if (renewal->m_hash != ctx.m_tx.GetHash())
{
Expand Down Expand Up @@ -649,8 +638,6 @@ void BeaconRegistry::Revert(const ContractContext& ctx)
else
{
// This else case should NOT happen because version 1 contracts were handled above. Log an error.
// It would probably happen with the renwal->m_status not in RENEWAL above, because the conditions
// would be coincident.
error("%s: Transaction hash %s: The identified renewal beacon for cpid %s to revert "
"does not have a m_prev_beacon_hash.",
__func__,
Expand Down