Skip to content

masternode|rpc: Remove unused code #3689

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
UdjinM6 merged 1 commit into from
Sep 8, 2020
Merged

masternode|rpc: Remove unused code #3689

Show file tree
Hide file tree
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
26 changes: 5 additions & 21 deletions src/masternode/masternode-sync.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@ void CMasternodeSync::Reset()
nTriedPeerCount = 0;
nTimeAssetSyncStarted = GetTime();
nTimeLastBumped = GetTime();
nTimeLastFailure = 0;
}

void CMasternodeSync::BumpAssetLastTime(const std::string& strFuncName)
{
if(IsSynced() || IsFailed()) return;
if (IsSynced()) return;
nTimeLastBumped = GetTime();
LogPrint(BCLog::MNSYNC, "CMasternodeSync::BumpAssetLastTime -- %s\n", strFuncName);
}
Expand All @@ -37,7 +36,6 @@ std::string CMasternodeSync::GetAssetName() const
case(MASTERNODE_SYNC_INITIAL): return "MASTERNODE_SYNC_INITIAL";
case(MASTERNODE_SYNC_WAITING): return "MASTERNODE_SYNC_WAITING";
case(MASTERNODE_SYNC_GOVERNANCE): return "MASTERNODE_SYNC_GOVERNANCE";
case(MASTERNODE_SYNC_FAILED): return "MASTERNODE_SYNC_FAILED";
case MASTERNODE_SYNC_FINISHED: return "MASTERNODE_SYNC_FINISHED";
default: return "UNKNOWN";
}
Expand All @@ -47,9 +45,6 @@ void CMasternodeSync::SwitchToNextAsset(CConnman& connman)
{
switch(nCurrentAsset)
{
case(MASTERNODE_SYNC_FAILED):
throw std::runtime_error("Can't switch to next asset from failed, should use Reset() first!");
break;
case(MASTERNODE_SYNC_INITIAL):
nCurrentAsset = MASTERNODE_SYNC_WAITING;
LogPrintf("CMasternodeSync::SwitchToNextAsset -- Starting %s\n", GetAssetName());
Expand Down Expand Up @@ -82,7 +77,6 @@ std::string CMasternodeSync::GetSyncStatus() const
case MASTERNODE_SYNC_INITIAL: return _("Synchronizing blockchain...");
case MASTERNODE_SYNC_WAITING: return _("Synchronization pending...");
case MASTERNODE_SYNC_GOVERNANCE: return _("Synchronizing governance objects...");
case MASTERNODE_SYNC_FAILED: return _("Synchronization failed");
case MASTERNODE_SYNC_FINISHED: return _("Synchronization finished");
default: return "";
}
Expand All @@ -92,8 +86,8 @@ void CMasternodeSync::ProcessMessage(CNode* pfrom, const std::string& strCommand
{
if (strCommand == NetMsgType::SYNCSTATUSCOUNT) { //Sync status count

//do not care about stats if sync process finished or failed
if(IsSynced() || IsFailed()) return;
//do not care about stats if sync process finished
if (IsSynced()) return;

int nItemID;
int nCount;
Expand Down Expand Up @@ -128,16 +122,6 @@ void CMasternodeSync::ProcessTick(CConnman& connman)

nTimeLastProcess = GetTime();

// reset sync status in case of any other sync failure
if(IsFailed()) {
if(nTimeLastFailure + (1*60) < GetTime()) { // 1 minute cooldown after failed sync
LogPrintf("CMasternodeSync::ProcessTick -- WARNING: failed to sync, trying again...\n");
Reset();
SwitchToNextAsset(connman);
}
return;
}

// gradually request the rest of the votes after sync finished
if(IsSynced()) {
std::vector<CNode*> vNodesCopy = connman.CopyNodeVector(CConnman::FullyConnectedOnly);
Expand Down Expand Up @@ -325,7 +309,7 @@ void CMasternodeSync::NotifyHeaderTip(const CBlockIndex *pindexNew, bool fInitia
{
LogPrint(BCLog::MNSYNC, "CMasternodeSync::NotifyHeaderTip -- pindexNew->nHeight: %d fInitialDownload=%d\n", pindexNew->nHeight, fInitialDownload);

if (IsFailed() || IsSynced() || !pindexBestHeader)
if (IsSynced() || !pindexBestHeader)
return;

if (!IsBlockchainSynced()) {
Expand All @@ -338,7 +322,7 @@ void CMasternodeSync::UpdatedBlockTip(const CBlockIndex *pindexNew, bool fInitia
{
LogPrint(BCLog::MNSYNC, "CMasternodeSync::UpdatedBlockTip -- pindexNew->nHeight: %d fInitialDownload=%d\n", pindexNew->nHeight, fInitialDownload);

if (IsFailed() || IsSynced() || !pindexBestHeader)
if (IsSynced() || !pindexBestHeader)
return;

if (!IsBlockchainSynced()) {
Expand Down
5 changes: 0 additions & 5 deletions src/masternode/masternode-sync.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

class CMasternodeSync;

static const int MASTERNODE_SYNC_FAILED = -1;
static const int MASTERNODE_SYNC_INITIAL = 0; // sync just started, was reset recently or still in IDB
static const int MASTERNODE_SYNC_WAITING = 1; // waiting after initial to see if we can get more headers/blocks
static const int MASTERNODE_SYNC_GOVERNANCE = 4;
Expand Down Expand Up @@ -38,16 +37,12 @@ class CMasternodeSync
int64_t nTimeAssetSyncStarted;
// ... last bumped
int64_t nTimeLastBumped;
// ... or failed
int64_t nTimeLastFailure;

public:
CMasternodeSync() { Reset(); }


static void SendGovernanceSyncRequest(CNode* pnode, CConnman& connman);

bool IsFailed() const { return nCurrentAsset == MASTERNODE_SYNC_FAILED; }
bool IsBlockchainSynced() const { return nCurrentAsset > MASTERNODE_SYNC_WAITING; }
bool IsSynced() const { return nCurrentAsset == MASTERNODE_SYNC_FINISHED; }

Expand Down
1 change: 0 additions & 1 deletion src/rpc/misc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ UniValue mnsync(const JSONRPCRequest& request)
objStatus.pushKV("Attempt", masternodeSync.GetAttempt());
objStatus.pushKV("IsBlockchainSynced", masternodeSync.IsBlockchainSynced());
objStatus.pushKV("IsSynced", masternodeSync.IsSynced());
objStatus.pushKV("IsFailed", masternodeSync.IsFailed());
return objStatus;
}

Expand Down