aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSamuel Dobson <dobsonsa68@gmail.com>2021-10-01 10:31:06 +1300
committerSamuel Dobson <dobsonsa68@gmail.com>2021-10-01 11:02:32 +1300
commit8615507a4e510bc797b01c4bbe45dc1f91e0bfa0 (patch)
treef8b3a3b0affa754cf75a0b0e0b270e0eba8f6009 /src
parent571bb94dfb5047c9be8fcbae5dae71de7256b86c (diff)
downloadbitcoin-8615507a4e510bc797b01c4bbe45dc1f91e0bfa0.tar.xz
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-
Diffstat (limited to 'src')
-rw-r--r--src/wallet/wallet.cpp2
-rw-r--r--src/wallet/walletdb.cpp2
-rw-r--r--src/wallet/walletdb.h2
-rw-r--r--src/wallet/wallettool.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 8dc30bfaeb..1c18cdb1bc 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -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;
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 11c35e70e9..528f77b14c 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -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;
}
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 39d1e2615c..715d9012ed 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -49,7 +49,7 @@ enum class DBErrors
TOO_NEW,
LOAD_FAIL,
NEED_REWRITE,
- RESCAN_REQUIRED
+ NEED_RESCAN
};
namespace DBKeys {
diff --git a/src/wallet/wallettool.cpp b/src/wallet/wallettool.cpp
index 4abfde76e2..e3cb5cee5d 100644
--- a/src/wallet/wallettool.cpp
+++ b/src/wallet/wallettool.cpp
@@ -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);