LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Remove dead feeest-file read code for old versions

Browse source 
0.15.0 introduced a new feeest file format, and support for parsing
old versions was never fully added. We now simply fail to read the
old format, so remove the dead partial-implementation.
This commit is contained in:
Matt Corallo 2017-12-19 11:19:28 -05:00
parent cdd6bbf10a
commit 62e7c04fb8
1 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/policy/fees.cpp
View file

@ -411,15 +411,13 @@ void TxConfirmStats::Read(CAutoFile& filein, int nFileVersion, size_t numBuckets
size_t maxConfirms, maxPeriods; size_t maxConfirms, maxPeriods;
// The current version will store the decay with each individual TxConfirmStats and also keep a scale factor // The current version will store the decay with each individual TxConfirmStats and also keep a scale factor
if (nFileVersion >= 149900) { filein >> decay;
filein >> decay; if (decay <= 0 || decay >= 1) {
if (decay <= 0 || decay >= 1) { throw std::runtime_error("Corrupt estimates file. Decay must be between 0 and 1 (non-inclusive)");
throw std::runtime_error("Corrupt estimates file. Decay must be between 0 and 1 (non-inclusive)"); }
} filein >> scale;
filein >> scale; if (scale == 0) {
if (scale == 0) { throw std::runtime_error("Corrupt estimates file. Scale must be non-zero");
throw std::runtime_error("Corrupt estimates file. Scale must be non-zero");
}
} }
filein >> avg; filein >> avg;
@ -443,20 +441,13 @@ void TxConfirmStats::Read(CAutoFile& filein, int nFileVersion, size_t numBuckets
} }
} }
if (nFileVersion >= 149900) { filein >> failAvg;
filein >> failAvg; if (maxPeriods != failAvg.size()) {
if (maxPeriods != failAvg.size()) { throw std::runtime_error("Corrupt estimates file. Mismatch in confirms tracked for failures");
throw std::runtime_error("Corrupt estimates file. Mismatch in confirms tracked for failures"); }
} for (unsigned int i = 0; i < maxPeriods; i++) {
for (unsigned int i = 0; i < maxPeriods; i++) { if (failAvg[i].size() != numBuckets) {
if (failAvg[i].size() != numBuckets) { throw std::runtime_error("Corrupt estimates file. Mismatch in one of failure average bucket counts");
throw std::runtime_error("Corrupt estimates file. Mismatch in one of failure average bucket counts");
}
}
} else {
failAvg.resize(confAvg.size());
for (unsigned int i = 0; i < failAvg.size(); i++) {
failAvg[i].resize(numBuckets);
} }
} }
@ -563,7 +554,7 @@ void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, boo
if (mapMemPoolTxs.count(hash)) { if (mapMemPoolTxs.count(hash)) {
LogPrint(BCLog::ESTIMATEFEE, "Blockpolicy error mempool tx %s already being tracked\n", LogPrint(BCLog::ESTIMATEFEE, "Blockpolicy error mempool tx %s already being tracked\n",
hash.ToString().c_str()); hash.ToString().c_str());
return; return;
} }
if (txHeight != nBestSeenHeight) { if (txHeight != nBestSeenHeight) {