dashpay · UdjinM6 · Sep 22, 2019 · Sep 19, 2019 · Sep 19, 2019 · Sep 19, 2019
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
@@ -173,15 +173,6 @@ CDeterministicMNCPtr CDeterministicMNList::GetMNByService(const CService& servic
     return GetUniquePropertyMN(service);
 }
 
-CDeterministicMNCPtr CDeterministicMNList::GetValidMNByService(const CService& service) const
-{
-    auto dmn = GetUniquePropertyMN(service);
-    if (dmn && !IsMNValid(dmn)) {
-        return nullptr;
-    }
-    return dmn;
-}
-
 CDeterministicMNCPtr CDeterministicMNList::GetMNByInternalId(uint64_t internalId) const
 {
     auto proTxHash = mnInternalIdMap.find(internalId);

diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
@@ -230,7 +230,6 @@ class CDeterministicMN
     std::string ToString() const;
     void ToJson(UniValue& obj) const;
 };
-typedef std::shared_ptr<CDeterministicMN> CDeterministicMNPtr;
 typedef std::shared_ptr<const CDeterministicMN> CDeterministicMNCPtr;
 
 class CDeterministicMNListDiff;
@@ -392,10 +391,6 @@ class CDeterministicMNList
     {
         return GetMN(proTxHash) != nullptr;
     }
-    bool HasValidMN(const uint256& proTxHash) const
-    {
-        return GetValidMN(proTxHash) != nullptr;
-    }
     bool HasMNByCollateral(const COutPoint& collateralOutpoint) const
     {
         return GetMNByCollateral(collateralOutpoint) != nullptr;
@@ -410,7 +405,6 @@ class CDeterministicMNList
     CDeterministicMNCPtr GetMNByCollateral(const COutPoint& collateralOutpoint) const;
     CDeterministicMNCPtr GetValidMNByCollateral(const COutPoint& collateralOutpoint) const;
     CDeterministicMNCPtr GetMNByService(const CService& service) const;
-    CDeterministicMNCPtr GetValidMNByService(const CService& service) const;
     CDeterministicMNCPtr GetMNByInternalId(uint64_t internalId) const;
     CDeterministicMNCPtr GetMNPayee() const;
 

diff --git a/src/governance/governance-classes.h b/src/governance/governance-classes.h
@@ -150,8 +150,6 @@ class CSuperblock : public CGovernanceObject
     int GetStatus() { return nStatus; }
     void SetStatus(int nStatusIn) { nStatus = nStatusIn; }
 
-    // IS THIS TRIGGER ALREADY EXECUTED?
-    bool IsExecuted() { return nStatus == SEEN_OBJECT_EXECUTED; }
     // TELL THE ENGINE WE EXECUTED THIS EVENT
     void SetExecuted() { nStatus = SEEN_OBJECT_EXECUTED; }
 

diff --git a/src/governance/governance-object.cpp b/src/governance/governance-object.cpp
@@ -275,19 +275,6 @@ std::set<uint256> CGovernanceObject::RemoveInvalidVotes(const COutPoint& mnOutpo
     return removedVotes;
 }
 
-std::string CGovernanceObject::GetSignatureMessage() const
-{
-    LOCK(cs);
-    std::string strMessage = nHashParent.ToString() + "|" +
-                             std::to_string(nRevision) + "|" +
-                             std::to_string(nTime) + "|" +
-                             GetDataAsHexString() + "|" +
-                             masternodeOutpoint.ToStringShort() + "|" +
-                             nCollateralHash.ToString();
-
-    return strMessage;
-}
-
 uint256 CGovernanceObject::GetHash() const
 {
     // Note: doesn't match serialization

diff --git a/src/governance/governance-object.h b/src/governance/governance-object.h
@@ -44,7 +44,6 @@ static const int64_t GOVERNANCE_ORPHAN_EXPIRATION_TIME = 10 * 60;
 // FOR SEEN MAP ARRAYS - GOVERNANCE OBJECTS AND VOTES
 static const int SEEN_OBJECT_IS_VALID = 0;
 static const int SEEN_OBJECT_ERROR_INVALID = 1;
-static const int SEEN_OBJECT_ERROR_IMMATURE = 2;
 static const int SEEN_OBJECT_EXECUTED = 3; //used for triggers
 static const int SEEN_OBJECT_UNKNOWN = 4;  // the default
 
@@ -258,7 +257,6 @@ class CGovernanceObject
     bool Sign(const CBLSSecretKey& key);
     bool CheckSignature(const CBLSPublicKey& pubKey) const;
 
-    std::string GetSignatureMessage() const;
     uint256 GetSignatureHash() const;
 
     // CORE OBJECT FUNCTIONS

diff --git a/src/governance/governance-votedb.h b/src/governance/governance-votedb.h
@@ -37,8 +37,6 @@ class CGovernanceObjectVoteFile
     typedef vote_m_t::const_iterator vote_m_cit;
 
 private:
-    static const int MAX_MEMORY_VOTES = -1;
-
     int nMemoryVotes;
 
     vote_l_t listVotes;

diff --git a/src/governance/governance.h b/src/governance/governance.h
@@ -198,10 +198,6 @@ class CGovernanceManager
 
     typedef txout_m_t::iterator txout_m_it;
 
-    typedef txout_m_t::const_iterator txout_m_cit;
-
-    typedef std::map<COutPoint, int> txout_int_m_t;
-
     typedef std::set<uint256> hash_s_t;
 
     typedef hash_s_t::iterator hash_s_it;
@@ -212,14 +208,10 @@ class CGovernanceManager
 
     typedef object_info_m_t::iterator object_info_m_it;
 
-    typedef object_info_m_t::const_iterator object_info_m_cit;
-
     typedef std::map<uint256, int64_t> hash_time_m_t;
 
     typedef hash_time_m_t::iterator hash_time_m_it;
 
-    typedef hash_time_m_t::const_iterator hash_time_m_cit;
-
 private:
     static const int MAX_CACHE_SIZE = 1000000;
 
@@ -380,10 +372,6 @@ class CGovernanceManager
         mapPostponedObjects.insert(std::make_pair(govobj.GetHash(), govobj));
     }
 
-    void AddSeenGovernanceObject(const uint256& nHash, int status);
-
-    void AddSeenVote(const uint256& nHash, int status);
-
     void MasternodeRateUpdate(const CGovernanceObject& govobj);
 
     bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false);
@@ -420,11 +408,6 @@ class CGovernanceManager
         cmapInvalidVotes.Insert(vote.GetHash(), vote);
     }
 
-    void AddOrphanVote(const CGovernanceVote& vote)
-    {
-        cmmapOrphanVotes.Insert(vote.GetHash(), vote_time_pair_t(vote, GetAdjustedTime() + GOVERNANCE_ORPHAN_EXPIRATION_TIME));
-    }
-
     bool ProcessVote(CNode* pfrom, const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman);
 
     /// Called to indicate a requested object has been received

diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
@@ -410,13 +410,4 @@ CQuorumCPtr CQuorumManager::GetQuorum(Consensus::LLMQType llmqType, const CBlock
     return quorum;
 }
 
-CQuorumCPtr CQuorumManager::GetNewestQuorum(Consensus::LLMQType llmqType)
-{
-    auto quorums = ScanQuorums(llmqType, 1);
-    if (quorums.empty()) {
-        return nullptr;
-    }
-    return quorums.front();
-}
-
 } // namespace llmq
diff --git a/src/llmq/quorums.h b/src/llmq/quorums.h
@@ -98,7 +98,6 @@ class CQuorumManager
 
     // all these methods will lock cs_main for a short period of time
     CQuorumCPtr GetQuorum(Consensus::LLMQType llmqType, const uint256& quorumHash);
-    CQuorumCPtr GetNewestQuorum(Consensus::LLMQType llmqType);
     std::vector<CQuorumCPtr> ScanQuorums(Consensus::LLMQType llmqType, size_t maxCount);
 
     // this one is cs_main-free

diff --git a/src/llmq/quorums_debug.cpp b/src/llmq/quorums_debug.cpp
@@ -176,14 +176,6 @@ void CDKGDebugManager::InitLocalSessionStatus(Consensus::LLMQType llmqType, cons
     session.members.resize((size_t)params.size);
 }
 
-void CDKGDebugManager::UpdateLocalStatus(std::function<bool(CDKGDebugStatus& status)>&& func)
-{
-    LOCK(cs);
-    if (func(localStatus)) {
-        localStatus.nTime = GetAdjustedTime();
-    }
-}
-
 void CDKGDebugManager::UpdateLocalSessionStatus(Consensus::LLMQType llmqType, std::function<bool(CDKGDebugSessionStatus& status)>&& func)
 {
     LOCK(cs);

diff --git a/src/llmq/quorums_debug.h b/src/llmq/quorums_debug.h
@@ -99,7 +99,6 @@ class CDKGDebugManager
     void ResetLocalSessionStatus(Consensus::LLMQType llmqType);
     void InitLocalSessionStatus(Consensus::LLMQType llmqType, const uint256& quorumHash, int quorumHeight);
 
-    void UpdateLocalStatus(std::function<bool(CDKGDebugStatus& status)>&& func);
     void UpdateLocalSessionStatus(Consensus::LLMQType llmqType, std::function<bool(CDKGDebugSessionStatus& status)>&& func);
     void UpdateLocalMemberStatus(Consensus::LLMQType llmqType, size_t memberIdx, std::function<bool(CDKGDebugMemberStatus& status)>&& func);
 };

diff --git a/src/llmq/quorums_dkgsession.h b/src/llmq/quorums_dkgsession.h
@@ -240,7 +240,6 @@ class CDKGSession
     friend class CDKGSessionHandler;
     friend class CDKGSessionManager;
     friend class CDKGLogger;
-    template<typename Message> friend class CDKGMessageHandler;
 
 private:
     const Consensus::LLMQParams& params;

diff --git a/src/llmq/quorums_signing_shares.cpp b/src/llmq/quorums_signing_shares.cpp
@@ -151,7 +151,6 @@ bool CSigSharesNodeState::GetSessionInfoByRecvId(uint32_t sessionId, SessionInfo
     if (!s) {
         return false;
     }
-    retInfo.recvSessionId = sessionId;
     retInfo.llmqType = s->llmqType;
     retInfo.quorumHash = s->quorumHash;
     retInfo.id = s->id;

diff --git a/src/llmq/quorums_signing_shares.h b/src/llmq/quorums_signing_shares.h
@@ -281,7 +281,6 @@ class CSigSharesNodeState
     // Used to avoid holding locks too long
     struct SessionInfo
     {
-        uint32_t recvSessionId;
         Consensus::LLMQType llmqType;
         uint256 quorumHash;
         uint256 id;

diff --git a/src/masternode/activemasternode.h b/src/masternode/activemasternode.h
@@ -17,12 +17,6 @@
 struct CActiveMasternodeInfo;
 class CActiveMasternodeManager;
 
-static const int ACTIVE_MASTERNODE_INITIAL          = 0; // initial state
-static const int ACTIVE_MASTERNODE_SYNC_IN_PROCESS  = 1;
-static const int ACTIVE_MASTERNODE_INPUT_TOO_NEW    = 2;
-static const int ACTIVE_MASTERNODE_NOT_CAPABLE      = 3;
-static const int ACTIVE_MASTERNODE_STARTED          = 4;
-
 extern CActiveMasternodeInfo activeMasternodeInfo;
 extern CActiveMasternodeManager* activeMasternodeManager;
 

diff --git a/src/masternode/masternode-meta.cpp b/src/masternode/masternode-meta.cpp
@@ -24,20 +24,6 @@ void CMasternodeMetaInfo::RemoveGovernanceObject(const uint256& nGovernanceObjec
     mapGovernanceObjectsVotedOn.erase(nGovernanceObjectHash);
 }
 
-/**
-*   FLAG GOVERNANCE ITEMS AS DIRTY
-*
-*   - When masternode come and go on the network, we must flag the items they voted on to recalc it's cached flags
-*
-*/
-void CMasternodeMetaInfo::FlagGovernanceItemsAsDirty()
-{
-    LOCK(cs);
-    for (auto& govObjHashPair : mapGovernanceObjectsVotedOn) {
-        mmetaman.AddDirtyGovernanceObjectHash(govObjHashPair.first);
-    }
-}
-
 CMasternodeMetaInfoPtr CMasternodeMetaMan::GetMetaInfo(const uint256& proTxHash, bool fCreate)
 {
     LOCK(cs);
@@ -87,12 +73,6 @@ void CMasternodeMetaMan::RemoveGovernanceObject(const uint256& nGovernanceObject
     }
 }
 
-void CMasternodeMetaMan::AddDirtyGovernanceObjectHash(const uint256& nHash)
-{
-    LOCK(cs);
-    vecDirtyGovernanceObjectHashes.push_back(nHash);
-}
-
 std::vector<uint256> CMasternodeMetaMan::GetAndClearDirtyGovernanceObjectHashes()
 {
     LOCK(cs);

diff --git a/src/masternode/masternode-meta.h b/src/masternode/masternode-meta.h
@@ -44,12 +44,6 @@ class CMasternodeMetaInfo
     {
     }
 
-    template <typename Stream>
-    CMasternodeMetaInfo(deserialize_type, Stream& s)
-    {
-        s >> *this;
-    }
-
     ADD_SERIALIZE_METHODS
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action)
@@ -70,8 +64,6 @@ class CMasternodeMetaInfo
 
     // KEEP TRACK OF EACH GOVERNANCE ITEM INCASE THIS NODE GOES OFFLINE, SO WE CAN RECALC THEIR STATUS
     void AddGovernanceVote(const uint256& nGovernanceObjectHash);
-    // RECALCULATE CACHED STATUS FLAGS FOR ALL AFFECTED OBJECTS
-    void FlagGovernanceItemsAsDirty();
 
     void RemoveGovernanceObject(const uint256& nGovernanceObjectHash);
 };
@@ -139,7 +131,6 @@ class CMasternodeMetaMan
     bool AddGovernanceVote(const uint256& proTxHash, const uint256& nGovernanceObjectHash);
     void RemoveGovernanceObject(const uint256& nGovernanceObjectHash);
 
-    void AddDirtyGovernanceObjectHash(const uint256& nHash);
     std::vector<uint256> GetAndClearDirtyGovernanceObjectHashes();
 
     void Clear();

diff --git a/src/masternode/masternode-sync.cpp b/src/masternode/masternode-sync.cpp
@@ -16,12 +16,6 @@
 class CMasternodeSync;
 CMasternodeSync masternodeSync;
 
-void CMasternodeSync::Fail()
-{
-    nTimeLastFailure = GetTime();
-    nCurrentAsset = MASTERNODE_SYNC_FAILED;
-}
-
 void CMasternodeSync::Reset()
 {
     nCurrentAsset = MASTERNODE_SYNC_INITIAL;

diff --git a/src/masternode/masternode-sync.h b/src/masternode/masternode-sync.h
@@ -41,8 +41,6 @@ class CMasternodeSync
     // ... or failed
     int64_t nTimeLastFailure;
 
-    void Fail();
-
 public:
     CMasternodeSync() { Reset(); }
 

diff --git a/src/masternode/masternode-utils.cpp b/src/masternode/masternode-utils.cpp
@@ -20,51 +20,6 @@ struct CompareScoreMN
     }
 };
 
-bool CMasternodeUtils::GetMasternodeScores(const uint256& nBlockHash, score_pair_vec_t& vecMasternodeScoresRet)
-{
-    vecMasternodeScoresRet.clear();
-
-    auto mnList = deterministicMNManager->GetListAtChainTip();
-    auto scores = mnList.CalculateScores(nBlockHash);
-    for (const auto& p : scores) {
-        vecMasternodeScoresRet.emplace_back(p.first, p.second);
-    }
-
-    std::sort(vecMasternodeScoresRet.rbegin(), vecMasternodeScoresRet.rend(), CompareScoreMN());
-    return !vecMasternodeScoresRet.empty();
-}
-
-bool CMasternodeUtils::GetMasternodeRank(const COutPoint& outpoint, int& nRankRet, uint256& blockHashRet, int nBlockHeight)
-{
-    nRankRet = -1;
-
-    if (!masternodeSync.IsBlockchainSynced())
-        return false;
-
-    // make sure we know about this block
-    blockHashRet = uint256();
-    if (!GetBlockHash(blockHashRet, nBlockHeight)) {
-        LogPrintf("CMasternodeUtils::%s -- ERROR: GetBlockHash() failed at nBlockHeight %d\n", __func__, nBlockHeight);
-        return false;
-    }
-
-    score_pair_vec_t vecMasternodeScores;
-    if (!GetMasternodeScores(blockHashRet, vecMasternodeScores))
-        return false;
-
-    int nRank = 0;
-    for (const auto& scorePair : vecMasternodeScores) {
-        nRank++;
-        if(scorePair.second->collateralOutpoint == outpoint) {
-            nRankRet = nRank;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
 void CMasternodeUtils::ProcessMasternodeConnections(CConnman& connman)
 {
     std::vector<CDeterministicMNCPtr> vecDmns; // will be empty when no wallet

diff --git a/src/masternode/masternode-utils.h b/src/masternode/masternode-utils.h
@@ -12,15 +12,6 @@ class CConnman;
 class CMasternodeUtils
 {
 public:
-    typedef std::pair<arith_uint256, CDeterministicMNCPtr> score_pair_t;
-    typedef std::vector<score_pair_t> score_pair_vec_t;
-    typedef std::pair<int, const CDeterministicMNCPtr> rank_pair_t;
-    typedef std::vector<rank_pair_t> rank_pair_vec_t;
-
-public:
-    static bool GetMasternodeScores(const uint256& nBlockHash, score_pair_vec_t& vecMasternodeScoresRet);
-    static bool GetMasternodeRank(const COutPoint &outpoint, int& nRankRet, uint256& blockHashRet, int nBlockHeight = -1);
-
     static void ProcessMasternodeConnections(CConnman& connman);
     static void DoMaintenance(CConnman &connman);
 };