mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-04-26 20:33:27 +02:00
scripted-diff: rename DBErrors::RESCAN_REQUIRED to NEED_RESCAN
-BEGIN VERIFY SCRIPT- git grep -l 'RESCAN_REQUIRED' src | xargs sed -i 's/RESCAN_REQUIRED/NEED_RESCAN/g' -END VERIFY SCRIPT-
This commit is contained in:
parent
571bb94dfb
commit
8615507a4e
@ -2560,7 +2560,7 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
|
||||
{
|
||||
error = strprintf(_("Wallet needed to be rewritten: restart %s to complete"), PACKAGE_NAME);
|
||||
return nullptr;
|
||||
} else if (nLoadWalletRet == DBErrors::RESCAN_REQUIRED) {
|
||||
} else if (nLoadWalletRet == DBErrors::NEED_RESCAN) {
|
||||
warnings.push_back(strprintf(_("Error reading %s! Transaction data may be missing or incorrect."
|
||||
" Rescanning wallet."), walletFile));
|
||||
rescan_required = true;
|
||||
|
@ -861,7 +861,7 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
|
||||
}
|
||||
|
||||
if (rescan_required && result == DBErrors::LOAD_OK) {
|
||||
result = DBErrors::RESCAN_REQUIRED;
|
||||
result = DBErrors::NEED_RESCAN;
|
||||
} else if (fNoncriticalErrors && result == DBErrors::LOAD_OK) {
|
||||
result = DBErrors::NONCRITICAL_ERROR;
|
||||
}
|
||||
|
@ -49,7 +49,7 @@ enum class DBErrors
|
||||
TOO_NEW,
|
||||
LOAD_FAIL,
|
||||
NEED_REWRITE,
|
||||
RESCAN_REQUIRED
|
||||
NEED_RESCAN
|
||||
};
|
||||
|
||||
namespace DBKeys {
|
||||
|
@ -76,7 +76,7 @@ static std::shared_ptr<CWallet> MakeWallet(const std::string& name, const fs::pa
|
||||
} else if (load_wallet_ret == DBErrors::NEED_REWRITE) {
|
||||
tfm::format(std::cerr, "Wallet needed to be rewritten: restart %s to complete", PACKAGE_NAME);
|
||||
return nullptr;
|
||||
} else if (load_wallet_ret == DBErrors::RESCAN_REQUIRED) {
|
||||
} else if (load_wallet_ret == DBErrors::NEED_RESCAN) {
|
||||
tfm::format(std::cerr, "Error reading %s! Some transaction data might be missing or"
|
||||
" incorrect. Wallet requires a rescan.",
|
||||
name);
|
||||
|
Loading…
x
Reference in New Issue
Block a user