highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-22 01:40:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
321159e53e800c1df2d8dfd6ac03374f1829c327 don't report minversion wallet entry as unknown (Gregory Sanders)

Pull request description:

  It is known in WalletBatch::LoadWallet

Tree-SHA512: 82f7e12f48ae7d17317074ce5b5e27c70ba8334b04adbf7cc863f8169cc1aa460b9454571e2698aa00059c8c8f669fe19c0d40c4910dcded260ddca6ce78be9d
This commit is contained in:
Wladimir J. van der Laan 2018-08-22 09:59:42 +02:00
commit 0738b88fe0
No known key found for this signature in database
GPG Key ID: 1E4AED62986CD25D
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wallet/walletdb.cpp
View File

@ -509,7 +509,8 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
strErr = "Error reading wallet database: Unknown non-tolerable wallet flags found"; strErr = "Error reading wallet database: Unknown non-tolerable wallet flags found";
return false; return false;
} }
} else if (strType != "bestblock" && strType != "bestblock_nomerkle") { } else if (strType != "bestblock" && strType != "bestblock_nomerkle" &&
strType != "minversion") {
wss.m_unknown_records++; wss.m_unknown_records++;
} }
} catch (...) } catch (...)