Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-06-01 06:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

walletdb: Refactor minversion loading

Browse Source 
Move minversion loading to its own function in WalletBatch
This commit is contained in:
Andrew Chow 2022-04-12 11:35:22 -04:00 committed by Andrew Chow
parent a36134fcc7
commit 01b35b55a1
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/wallet/walletdb.cpp
View File

@ -791,6 +791,18 @@ bool WalletBatch::IsKeyType(const std::string& strType)
strType == DBKeys::MASTER_KEY || strType == DBKeys::CRYPTED_KEY); strType == DBKeys::MASTER_KEY || strType == DBKeys::CRYPTED_KEY);
} }
static DBErrors LoadMinVersion(CWallet* pwallet, DatabaseBatch& batch) EXCLUSIVE_LOCKS_REQUIRED(pwallet->cs_wallet)
{
AssertLockHeld(pwallet->cs_wallet);
int nMinVersion = 0;
if (batch.Read(DBKeys::MINVERSION, nMinVersion)) {
if (nMinVersion > FEATURE_LATEST)
return DBErrors::TOO_NEW;
pwallet->LoadMinVersion(nMinVersion);
}
return DBErrors::LOAD_OK;
}
DBErrors WalletBatch::LoadWallet(CWallet* pwallet) DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
{ {
CWalletScanState wss; CWalletScanState wss;
@ -806,12 +818,7 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
pwallet->WalletLogPrintf("Wallet file version = %d, last client version = %d\n", pwallet->GetVersion(), last_client); pwallet->WalletLogPrintf("Wallet file version = %d, last client version = %d\n", pwallet->GetVersion(), last_client);
try { try {
int nMinVersion = 0; if ((result = LoadMinVersion(pwallet, *m_batch)) != DBErrors::LOAD_OK) return result;
if (m_batch->Read(DBKeys::MINVERSION, nMinVersion)) {
if (nMinVersion > FEATURE_LATEST)
return DBErrors::TOO_NEW;
pwallet->LoadMinVersion(nMinVersion);
}
// Load wallet flags, so they are known when processing other records. // Load wallet flags, so they are known when processing other records.
// The FLAGS key is absent during wallet creation. // The FLAGS key is absent during wallet creation.