Merge #13967: [walletdb] don't report minversion wallet entry as unknown

laanwj · laanwj · commit 0738b88fe0b6 · 2018-08-22T10:02:11.000+02:00
321159e don't report minversion wallet entry as unknown (Gregory Sanders) Pull request description: It is known in WalletBatch::LoadWallet Tree-SHA512: 82f7e12f48ae7d17317074ce5b5e27c70ba8334b04adbf7cc863f8169cc1aa460b9454571e2698aa00059c8c8f669fe19c0d40c4910dcded260ddca6ce78be9d
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -509,7 +509,8 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
                 strErr = "Error reading wallet database: Unknown non-tolerable wallet flags found";
                 return false;
             }
-        } else if (strType != "bestblock" && strType != "bestblock_nomerkle") {
+        } else if (strType != "bestblock" && strType != "bestblock_nomerkle" &&
+                strType != "minversion") {
             wss.m_unknown_records++;
         }
     } catch (...)

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,8 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,`
`509`	`509`	`strErr = "Error reading wallet database: Unknown non-tolerable wallet flags found";`
`510`	`510`	`return false;`
`511`	`511`	`}`
`512`		`- } else if (strType != "bestblock" && strType != "bestblock_nomerkle") {`
	`512`	`+ } else if (strType != "bestblock" && strType != "bestblock_nomerkle" &&`
	`513`	`+ strType != "minversion") {`
`513`	`514`	`wss.m_unknown_records++;`
`514`	`515`	`}`
`515`	`516`	`} catch (...)`