sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 21:12:48 +01:00
Code Issues Actions Packages Projects Releases 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

9
src/policy/fees.cpp
View File

@ -411,7 +411,6 @@ 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)");
@ -420,7 +419,6 @@ void TxConfirmStats::Read(CAutoFile& filein, int nFileVersion, size_t numBuckets
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;
if (avg.size() != numBuckets) { if (avg.size() != numBuckets) {
@ -443,7 +441,6 @@ 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");
@ -453,12 +450,6 @@ void TxConfirmStats::Read(CAutoFile& filein, int nFileVersion, size_t 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);
}
}
// Resize the current block variables which aren't stored in the data file // Resize the current block variables which aren't stored in the data file
// to match the number of confirms and buckets // to match the number of confirms and buckets