From 97f36eb03a7f5a6f09999fcfbe9f0738475948eb Mon Sep 17 00:00:00 2001 From: xdustinface Date: Mon, 7 Sep 2020 12:11:46 +0200 Subject: [PATCH] masternode|rpc: Remove unused code --- src/masternode/masternode-sync.cpp | 26 +++++--------------------- src/masternode/masternode-sync.h | 5 ----- src/rpc/misc.cpp | 1 - 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/src/masternode/masternode-sync.cpp b/src/masternode/masternode-sync.cpp index cbf415289ab3..8a2423db1b66 100644 --- a/src/masternode/masternode-sync.cpp +++ b/src/masternode/masternode-sync.cpp @@ -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); } @@ -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"; } @@ -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()); @@ -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 ""; } @@ -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; @@ -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 vNodesCopy = connman.CopyNodeVector(CConnman::FullyConnectedOnly); @@ -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()) { @@ -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()) { diff --git a/src/masternode/masternode-sync.h b/src/masternode/masternode-sync.h index 4252bbf5d4b1..fe160b6767b1 100644 --- a/src/masternode/masternode-sync.h +++ b/src/masternode/masternode-sync.h @@ -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; @@ -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; } diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index e25f7e3a0e1e..0b726810a2c0 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -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; }