changeset 26698:ad66a3e06b3e

Merge #9819: Remove harmless read of unusued priority estimates bc8fd12 Remove harmless read of unusued priority estimates (Alex Morcos)
author Wladimir J. van der Laan <laanwj@gmail.com>
date Wed, 22 Feb 2017 13:00:53 +0100
parents 7f0db8fb6fd4 53ca106f0e69
children f9e290155672
files
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/policy/fees.cpp	Wed Feb 22 12:42:55 2017 +0100
+++ b/src/policy/fees.cpp	Wed Feb 22 13:00:53 2017 +0100
@@ -482,10 +482,7 @@
     filein >> nFileBestSeenHeight;
     feeStats.Read(filein);
     nBestSeenHeight = nFileBestSeenHeight;
-    if (nFileVersion < 139900) {
-        TxConfirmStats priStats;
-        priStats.Read(filein);
-    }
+    // if nVersionThatWrote < 139900 then another TxConfirmStats (for priority) follows but can be ignored.
 }
 
 FeeFilterRounder::FeeFilterRounder(const CFeeRate& minIncrementalFee)