scripted-diff: rename DBErrors::RESCAN_REQUIRED to NEED_RESCAN

meshcollider · meshcollider · commit 8615507a4e51 · 2021-10-01T11:02:32.000+13:00
-BEGIN VERIFY SCRIPT-
git grep -l 'RESCAN_REQUIRED' src | xargs sed -i 's/RESCAN_REQUIRED/NEED_RESCAN/g'
-END VERIFY SCRIPT-
diff --git 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
@@ -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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -2560,7 +2560,7 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri`
`2560`	`2560`	`{`
`2561`	`2561`	`error = strprintf(_("Wallet needed to be rewritten: restart %s to complete"), PACKAGE_NAME);`
`2562`	`2562`	`return nullptr;`
`2563`		`- } else if (nLoadWalletRet == DBErrors::RESCAN_REQUIRED) {`
	`2563`	`+ } else if (nLoadWalletRet == DBErrors::NEED_RESCAN) {`
`2564`	`2564`	`warnings.push_back(strprintf(_("Error reading %s! Transaction data may be missing or incorrect."`
`2565`	`2565`	`" Rescanning wallet."), walletFile));`
`2566`	`2566`	`rescan_required = true;`
Original file line number	Diff line number	Diff line change
`@@ -861,7 +861,7 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)`
`861`	`861`	`}`
`862`	`862`
`863`	`863`	`if (rescan_required && result == DBErrors::LOAD_OK) {`
`864`		`- result = DBErrors::RESCAN_REQUIRED;`
	`864`	`+ result = DBErrors::NEED_RESCAN;`
`865`	`865`	`} else if (fNoncriticalErrors && result == DBErrors::LOAD_OK) {`
`866`	`866`	`result = DBErrors::NONCRITICAL_ERROR;`
`867`	`867`	`}`