Merge #13967: [walletdb] don't report minversion wallet entry as unknown
321159e53e
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:
commit
0738b88fe0
1 changed files with 2 additions and 1 deletions
|
@ -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 (...)
|
||||||
|
|
Loading…
Reference in a new issue