kvazar
/
kevacoin
mirror of https://github.com/kvazar-network/kevacoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge #11951: Remove dead feeest-file read code for old versions 

62e7c04 Remove dead feeest-file read code for old versions (Matt Corallo)

Pull request description:

  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.

  Follow up to #11273.

Tree-SHA512: c291ce51b7cb0c93479c18a1885dd646cbe03e4c7d12df03c0e99c0634e1bf9f9e41facf54a645227154bab58b9988f21b928cf3fc0520087c4eede4258c8861
0.16
Wladimir J. van der Laan 7 years ago
parent
cfd99ddc3c 62e7c04fb8
commit
1fb34e0d1f
No known key found for this signature in database
GPG Key ID: 1E4AED62986CD25D
1 changed files with 15 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/policy/fees.cpp

9
src/policy/fees.cpp
Unescape 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

Write Preview
Loading…
Cancel
Save