mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-02-09 02:59:31 +08:00
refactor: wallet: Factor out WriteVersion() from PopulateWalletFromDB()
Writing the wallet's `CLIENT_VERSION` (which indicates the last version to have touched a wallet) needs to be done on both wallet creation and wallet loading. The next commit removes the `PopulateWalletFromDatabase()` call from wallet creation, but this behavior needs to be preserved, so this commit factors setting `CLIENT_VERSION` out of `PopulateWalletFromDatabase()` so that wallet creation can use it in the next commit.
This commit is contained in:
@@ -1175,7 +1175,7 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
|
||||
return result;
|
||||
|
||||
if (!has_last_client || last_client != CLIENT_VERSION) // Update
|
||||
m_batch->Write(DBKeys::VERSION, CLIENT_VERSION);
|
||||
this->WriteVersion(CLIENT_VERSION);
|
||||
|
||||
if (any_unordered)
|
||||
result = pwallet->ReorderTransactions();
|
||||
|
||||
@@ -265,6 +265,9 @@ public:
|
||||
|
||||
DBErrors LoadWallet(CWallet* pwallet);
|
||||
|
||||
//! Write the given client_version.
|
||||
bool WriteVersion(int client_version) { return m_batch->Write(DBKeys::VERSION, CLIENT_VERSION); }
|
||||
|
||||
//! Delete records of the given types
|
||||
bool EraseRecords(const std::unordered_set<std::string>& types);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user