highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-28 05:13:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

scripted-diff: rename DBErrors::RESCAN_REQUIRED to NEED_RESCAN

Browse Source 
-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:
Samuel Dobson 2021-10-01 10:31:06 +13:00
parent 571bb94dfb
commit 8615507a4e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/wallet.cpp
View File

@ -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); error = strprintf(_("Wallet needed to be rewritten: restart %s to complete"), PACKAGE_NAME);
return nullptr; 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." warnings.push_back(strprintf(_("Error reading %s! Transaction data may be missing or incorrect."
" Rescanning wallet."), walletFile)); " Rescanning wallet."), walletFile));
rescan_required = true; rescan_required = true;

2
src/wallet/walletdb.cpp
View File

@ -861,7 +861,7 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
} }
if (rescan_required && result == DBErrors::LOAD_OK) { if (rescan_required && result == DBErrors::LOAD_OK) {
result = DBErrors::RESCAN_REQUIRED; result = DBErrors::NEED_RESCAN;
} else if (fNoncriticalErrors && result == DBErrors::LOAD_OK) { } else if (fNoncriticalErrors && result == DBErrors::LOAD_OK) {
result = DBErrors::NONCRITICAL_ERROR; result = DBErrors::NONCRITICAL_ERROR;
} }

2
src/wallet/walletdb.h
View File

@ -49,7 +49,7 @@ enum class DBErrors
TOO_NEW, TOO_NEW,
LOAD_FAIL, LOAD_FAIL,
NEED_REWRITE, NEED_REWRITE,
RESCAN_REQUIRED NEED_RESCAN
}; };
namespace DBKeys { namespace DBKeys {

2
src/wallet/wallettool.cpp
View File

@ -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) { } else if (load_wallet_ret == DBErrors::NEED_REWRITE) {
tfm::format(std::cerr, "Wallet needed to be rewritten: restart %s to complete", PACKAGE_NAME); tfm::format(std::cerr, "Wallet needed to be rewritten: restart %s to complete", PACKAGE_NAME);
return nullptr; 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" tfm::format(std::cerr, "Error reading %s! Some transaction data might be missing or"
" incorrect. Wallet requires a rescan.", " incorrect. Wallet requires a rescan.",
name); name);