neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

simplify CMasternodePayments::IsEnoughData (always using GetStorageLimit) (#1025)

Browse Source 
* simplify CMasternodePayments::IsEnoughData (always using GetStorageLimit)
This commit is contained in:
UdjinM6 2016-09-21 19:32:42 +04:00 committed by GitHub
parent ec239ffa36
commit d6637c2e8e
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/masternode-payments.cpp
View File

@ -848,16 +848,11 @@ std::string CMasternodePayments::ToString() const
return info.str(); return info.str();
} }
bool CMasternodePayments::IsEnoughData(int nMnCount) { bool CMasternodePayments::IsEnoughData()
if(GetBlockCount() > nMnCount * nStorageCoeff && GetBlockCount() > nMinBlocksToStore)
{ {
float nAverageVotes = (MNPAYMENTS_SIGNATURES_TOTAL + MNPAYMENTS_SIGNATURES_REQUIRED) / 2; float nAverageVotes = (MNPAYMENTS_SIGNATURES_TOTAL + MNPAYMENTS_SIGNATURES_REQUIRED) / 2;
if(GetVoteCount() > nMnCount * nStorageCoeff * nAverageVotes && GetVoteCount() > nMinBlocksToStore * nAverageVotes) int nStorageLimit = GetStorageLimit();
{ return GetBlockCount() > nStorageLimit && GetVoteCount() > nStorageLimit * nAverageVotes;
return true;
}
}
return false;
} }
int CMasternodePayments::GetStorageLimit() int CMasternodePayments::GetStorageLimit()

2
src/masternode-payments.h
View File

@ -205,7 +205,7 @@ public:
int GetBlockCount() { return mapMasternodeBlocks.size(); } int GetBlockCount() { return mapMasternodeBlocks.size(); }
int GetVoteCount() { return mapMasternodePaymentVotes.size(); } int GetVoteCount() { return mapMasternodePaymentVotes.size(); }
bool IsEnoughData(int nMnCount); bool IsEnoughData();
int GetStorageLimit(); int GetStorageLimit();
void UpdatedBlockTip(const CBlockIndex *pindex); void UpdatedBlockTip(const CBlockIndex *pindex);

2
src/masternode-sync.cpp
View File

@ -296,7 +296,7 @@ void CMasternodeSync::ProcessTick()
// check for data // check for data
// if mnpayments already has enough blocks and votes, switch to the next asset // if mnpayments already has enough blocks and votes, switch to the next asset
// try to fetch data from at least two peers though // try to fetch data from at least two peers though
if(nRequestedMasternodeAttempt > 1 && mnpayments.IsEnoughData(mnpayments.GetStorageLimit())) { if(nRequestedMasternodeAttempt > 1 && mnpayments.IsEnoughData()) {
LogPrintf("CMasternodeSync::Process -- nTick %d nRequestedMasternodeAssets %d -- found enough data\n", nTick, nRequestedMasternodeAssets); LogPrintf("CMasternodeSync::Process -- nTick %d nRequestedMasternodeAssets %d -- found enough data\n", nTick, nRequestedMasternodeAssets);
SwitchToNextAsset(); SwitchToNextAsset();
return; return;