From 7a01ad7a5c2cd5f8b77660334eae03be44780e69 Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 19:43:40 -0500 Subject: [PATCH 01/19] remove unused code Signed-off-by: Pasta --- src/masternode/activemasternode.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/masternode/activemasternode.h b/src/masternode/activemasternode.h index 73f8c5288bb3..c5da79512ea5 100644 --- 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; From 6f74a2a2d39729d289ad87a3150bc9a955f2cf08 Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 19:53:08 -0500 Subject: [PATCH 02/19] remove unused code Signed-off-by: Pasta --- src/masternode/masternode-meta.cpp | 20 -------------------- src/masternode/masternode-meta.h | 3 --- 2 files changed, 23 deletions(-) diff --git a/src/masternode/masternode-meta.cpp b/src/masternode/masternode-meta.cpp index 9ec37b9e247f..3b86b7798446 100644 --- 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 CMasternodeMetaMan::GetAndClearDirtyGovernanceObjectHashes() { LOCK(cs); diff --git a/src/masternode/masternode-meta.h b/src/masternode/masternode-meta.h index fe4104611d44..0c10bbe72c43 100644 --- a/src/masternode/masternode-meta.h +++ b/src/masternode/masternode-meta.h @@ -70,8 +70,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 +137,6 @@ class CMasternodeMetaMan bool AddGovernanceVote(const uint256& proTxHash, const uint256& nGovernanceObjectHash); void RemoveGovernanceObject(const uint256& nGovernanceObjectHash); - void AddDirtyGovernanceObjectHash(const uint256& nHash); std::vector GetAndClearDirtyGovernanceObjectHashes(); void Clear(); From 2103c655b0354e69a17a11ad6a7804d875ea53b1 Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 19:55:25 -0500 Subject: [PATCH 03/19] remove unused code Signed-off-by: Pasta --- src/masternode/masternode-meta.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/masternode/masternode-meta.h b/src/masternode/masternode-meta.h index 0c10bbe72c43..480464705c9d 100644 --- a/src/masternode/masternode-meta.h +++ b/src/masternode/masternode-meta.h @@ -35,7 +35,6 @@ class CMasternodeMetaInfo public: CMasternodeMetaInfo() {} - CMasternodeMetaInfo(const uint256& _proTxHash) : proTxHash(_proTxHash) {} CMasternodeMetaInfo(const CMasternodeMetaInfo& ref) : proTxHash(ref.proTxHash), nLastDsq(ref.nLastDsq), From 81e4bcebd2fdf9603329cc11f088c69031555690 Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 19:56:03 -0500 Subject: [PATCH 04/19] remove unused code Signed-off-by: Pasta --- src/masternode/masternode-meta.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/masternode/masternode-meta.h b/src/masternode/masternode-meta.h index 480464705c9d..9c005afe3dd1 100644 --- a/src/masternode/masternode-meta.h +++ b/src/masternode/masternode-meta.h @@ -35,6 +35,7 @@ class CMasternodeMetaInfo public: CMasternodeMetaInfo() {} + CMasternodeMetaInfo(const uint256& _proTxHash) : proTxHash(_proTxHash) {} CMasternodeMetaInfo(const CMasternodeMetaInfo& ref) : proTxHash(ref.proTxHash), nLastDsq(ref.nLastDsq), @@ -43,12 +44,6 @@ class CMasternodeMetaInfo { } - template - CMasternodeMetaInfo(deserialize_type, Stream& s) - { - s >> *this; - } - ADD_SERIALIZE_METHODS template inline void SerializationOp(Stream& s, Operation ser_action) From 2e55e888c34b094a26f576f0cf955de96a92c544 Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 19:58:36 -0500 Subject: [PATCH 05/19] remove unused code Signed-off-by: Pasta --- src/masternode/masternode-sync.cpp | 6 ------ src/masternode/masternode-sync.h | 2 -- 2 files changed, 8 deletions(-) diff --git a/src/masternode/masternode-sync.cpp b/src/masternode/masternode-sync.cpp index d66b4ac55eb4..6c23df6e939a 100644 --- 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 index c68c56368a52..3cf965b17696 100644 --- 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(); } From 3d37f738eaeec9e392e7835ce7488b334d559969 Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 20:00:57 -0500 Subject: [PATCH 06/19] remove unused code Signed-off-by: Pasta --- src/masternode/masternode-utils.cpp | 45 ----------------------------- src/masternode/masternode-utils.h | 3 -- 2 files changed, 48 deletions(-) diff --git a/src/masternode/masternode-utils.cpp b/src/masternode/masternode-utils.cpp index 551d5a50485b..d4abbe81afbd 100644 --- 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 vecDmns; // will be empty when no wallet diff --git a/src/masternode/masternode-utils.h b/src/masternode/masternode-utils.h index 28d3395bd5da..3d12db9a80be 100644 --- a/src/masternode/masternode-utils.h +++ b/src/masternode/masternode-utils.h @@ -18,9 +18,6 @@ class CMasternodeUtils typedef std::vector 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); }; From 4114816630abdcf6e133cc118c99d5954deaf789 Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 20:02:13 -0500 Subject: [PATCH 07/19] remove unused code Signed-off-by: Pasta --- src/masternode/masternode-utils.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/masternode/masternode-utils.h b/src/masternode/masternode-utils.h index 3d12db9a80be..7786f2ec550c 100644 --- a/src/masternode/masternode-utils.h +++ b/src/masternode/masternode-utils.h @@ -11,12 +11,6 @@ class CConnman; class CMasternodeUtils { -public: - typedef std::pair score_pair_t; - typedef std::vector score_pair_vec_t; - typedef std::pair rank_pair_t; - typedef std::vector rank_pair_vec_t; - public: static void ProcessMasternodeConnections(CConnman& connman); static void DoMaintenance(CConnman &connman); From 0a01b81026427b133196e6fcc46b7ade5e0cbbb2 Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 20:05:21 -0500 Subject: [PATCH 08/19] remove unused code Signed-off-by: Pasta --- src/llmq/quorums_signing_shares.cpp | 1 - src/llmq/quorums_signing_shares.h | 1 - 2 files changed, 2 deletions(-) diff --git a/src/llmq/quorums_signing_shares.cpp b/src/llmq/quorums_signing_shares.cpp index ff23633a472d..073e9a90b286 100644 --- 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 index 8f056c679a53..72d18bf5056c 100644 --- 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; From 9b9185cfb60437d3c44e0607d1351ec60b7ed1d4 Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 20:09:23 -0500 Subject: [PATCH 09/19] remove unused code Signed-off-by: Pasta --- src/llmq/quorums_dkgsession.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/llmq/quorums_dkgsession.h b/src/llmq/quorums_dkgsession.h index 045c9e3f1af8..6acc438f107c 100644 --- 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 friend class CDKGMessageHandler; private: const Consensus::LLMQParams& params; From aee2a22a7110193787b152babecd43dc4e4ae00b Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 20:11:30 -0500 Subject: [PATCH 10/19] remove unused code Signed-off-by: Pasta --- src/llmq/quorums_debug.cpp | 8 -------- src/llmq/quorums_debug.h | 1 - 2 files changed, 9 deletions(-) diff --git a/src/llmq/quorums_debug.cpp b/src/llmq/quorums_debug.cpp index e0710e0931c7..072ea01c9c2b 100644 --- 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&& func) -{ - LOCK(cs); - if (func(localStatus)) { - localStatus.nTime = GetAdjustedTime(); - } -} - void CDKGDebugManager::UpdateLocalSessionStatus(Consensus::LLMQType llmqType, std::function&& func) { LOCK(cs); diff --git a/src/llmq/quorums_debug.h b/src/llmq/quorums_debug.h index b26179120a07..d6721914edb5 100644 --- 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&& func); void UpdateLocalSessionStatus(Consensus::LLMQType llmqType, std::function&& func); void UpdateLocalMemberStatus(Consensus::LLMQType llmqType, size_t memberIdx, std::function&& func); }; From 5ea520e88ae1651c106fba3a0bcb8af3656b1ace Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 20:25:40 -0500 Subject: [PATCH 11/19] remove unused code Signed-off-by: Pasta --- src/llmq/quorums.cpp | 9 --------- src/llmq/quorums.h | 1 - 2 files changed, 10 deletions(-) diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp index 67a7a6a945c7..06113fb8a926 100644 --- 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 index 9f945c088859..4737b78c7a64 100644 --- 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 ScanQuorums(Consensus::LLMQType llmqType, size_t maxCount); // this one is cs_main-free From 2f8cbfdd6695e635b417289e2c17950da8c248c2 Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 20:36:24 -0500 Subject: [PATCH 12/19] remove unused code Signed-off-by: Pasta --- src/governance/governance.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/governance/governance.h b/src/governance/governance.h index 4a621f05842f..3aa6dfd4e944 100644 --- 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 txout_int_m_t; - typedef std::set 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 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 From 7a430ac25318c04c914c792861e8fb69dc50d8df Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 20:41:07 -0500 Subject: [PATCH 13/19] remove unused code Signed-off-by: Pasta --- src/governance/governance-classes.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/governance/governance-classes.h b/src/governance/governance-classes.h index 524ca19e601e..9ed8e0df1fbd 100644 --- 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; } From dbdb4808384bfdd89850997b454409d024a05599 Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 20:44:43 -0500 Subject: [PATCH 14/19] remove unused code, maybe need to revert / change the surrounding values Signed-off-by: Pasta --- src/governance/governance-object.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/governance/governance-object.h b/src/governance/governance-object.h index 5507ddaabb20..0019376923b5 100644 --- 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 From 73794491e6e1f83009850e1ae58e30b27ec13561 Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 20:47:24 -0500 Subject: [PATCH 15/19] remove unused code Signed-off-by: Pasta --- src/governance/governance-object.cpp | 13 ------------- src/governance/governance-object.h | 1 - 2 files changed, 14 deletions(-) diff --git a/src/governance/governance-object.cpp b/src/governance/governance-object.cpp index 56de14f6e18f..429f4c099988 100644 --- a/src/governance/governance-object.cpp +++ b/src/governance/governance-object.cpp @@ -275,19 +275,6 @@ std::set 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 index 0019376923b5..20f8b379cfb8 100644 --- a/src/governance/governance-object.h +++ b/src/governance/governance-object.h @@ -257,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 From 6939b6c8e292ceff290bb6406346b66c7fc73fab Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 20:55:58 -0500 Subject: [PATCH 16/19] remove unused code Signed-off-by: Pasta --- src/governance/governance-votedb.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/governance/governance-votedb.h b/src/governance/governance-votedb.h index 2a18e6f0add4..4e8703c2d6b3 100644 --- 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; From 5ea5d45ce9560004de6d5f18bedce2882b98d10c Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 20:56:02 -0500 Subject: [PATCH 17/19] remove unused code Signed-off-by: Pasta --- src/evo/deterministicmns.cpp | 9 --------- src/evo/deterministicmns.h | 6 ------ 2 files changed, 15 deletions(-) diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp index 393219d06484..fb919e3fc613 100644 --- 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 index a95e313e3395..18c0289c96c3 100644 --- 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 CDeterministicMNPtr; typedef std::shared_ptr 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; From 8ea0bbbc7b8ab1e779c02ae1dd029c11a9817d2e Mon Sep 17 00:00:00 2001 From: Pasta Date: Wed, 18 Sep 2019 20:57:08 -0500 Subject: [PATCH 18/19] remove unused code Signed-off-by: Pasta --- src/evo/providertx.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/evo/providertx.h b/src/evo/providertx.h index 1e7218d540d0..5393c0eba886 100644 --- a/src/evo/providertx.h +++ b/src/evo/providertx.h @@ -195,9 +195,7 @@ class CProUpRevTx // these are just informational and do not have any effect on the revocation enum { REASON_NOT_SPECIFIED = 0, - REASON_TERMINATION_OF_SERVICE = 1, - REASON_COMPROMISED_KEYS = 2, - REASON_CHANGE_OF_KEYS = 3, + REASON_CHANGE_OF_KEYS = 1, REASON_LAST = REASON_CHANGE_OF_KEYS }; From f2ab1ca5a50438d173eb1f7d5511d63a4b57a06f Mon Sep 17 00:00:00 2001 From: Pasta Date: Thu, 19 Sep 2019 07:36:47 -0500 Subject: [PATCH 19/19] Revert "remove unused code" This reverts commit 8ea0bbbc7b8ab1e779c02ae1dd029c11a9817d2e. --- src/evo/providertx.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/evo/providertx.h b/src/evo/providertx.h index 5393c0eba886..1e7218d540d0 100644 --- a/src/evo/providertx.h +++ b/src/evo/providertx.h @@ -195,7 +195,9 @@ class CProUpRevTx // these are just informational and do not have any effect on the revocation enum { REASON_NOT_SPECIFIED = 0, - REASON_CHANGE_OF_KEYS = 1, + REASON_TERMINATION_OF_SERVICE = 1, + REASON_COMPROMISED_KEYS = 2, + REASON_CHANGE_OF_KEYS = 3, REASON_LAST = REASON_CHANGE_OF_KEYS };