wallet: Add external-signer-support specific error message

hebasto · hebasto · commit 7f3a6a9495fa · 2022-02-20T21:04:23.000+02:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2692,6 +2692,10 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
             error = strprintf(_("Error loading %s: Wallet requires newer version of %s"), walletFile, PACKAGE_NAME);
             return nullptr;
         }
+        else if (nLoadWalletRet == DBErrors::EXTERNAL_SIGNER_SUPPORT_REQUIRED) {
+            error = strprintf(_("Error loading %s: External signer wallet being loaded without external signer support compiled"), walletFile);
+            return nullptr;
+        }
         else if (nLoadWalletRet == DBErrors::NEED_REWRITE)
         {
             error = strprintf(_("Wallet needed to be rewritten: restart %s to complete"), PACKAGE_NAME);
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -788,7 +788,7 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
 #ifndef ENABLE_EXTERNAL_SIGNER
         if (pwallet->IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER)) {
             pwallet->WalletLogPrintf("Error: External signer wallet being loaded without external signer support compiled\n");
-            return DBErrors::TOO_NEW;
+            return DBErrors::EXTERNAL_SIGNER_SUPPORT_REQUIRED;
         }
 #endif
 
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
@@ -48,6 +48,7 @@ enum class DBErrors
     CORRUPT,
     NONCRITICAL_ERROR,
     TOO_NEW,
+    EXTERNAL_SIGNER_SUPPORT_REQUIRED,
     LOAD_FAIL,
     NEED_REWRITE,
     NEED_RESCAN

Original file line number	Diff line number	Diff line change
`@@ -2692,6 +2692,10 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri`
`2692`	`2692`	`error = strprintf(_("Error loading %s: Wallet requires newer version of %s"), walletFile, PACKAGE_NAME);`
`2693`	`2693`	`return nullptr;`
`2694`	`2694`	`}`
	`2695`	`+ else if (nLoadWalletRet == DBErrors::EXTERNAL_SIGNER_SUPPORT_REQUIRED) {`
	`2696`	`+ error = strprintf(_("Error loading %s: External signer wallet being loaded without external signer support compiled"), walletFile);`
	`2697`	`+ return nullptr;`
	`2698`	`+ }`
`2695`	`2699`	`else if (nLoadWalletRet == DBErrors::NEED_REWRITE)`
`2696`	`2700`	`{`
`2697`	`2701`	`error = strprintf(_("Wallet needed to be rewritten: restart %s to complete"), PACKAGE_NAME);`
Original file line number	Diff line number	Diff line change
`@@ -788,7 +788,7 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)`
`788`	`788`	`#ifndef ENABLE_EXTERNAL_SIGNER`
`789`	`789`	`if (pwallet->IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER)) {`
`790`	`790`	`pwallet->WalletLogPrintf("Error: External signer wallet being loaded without external signer support compiled\n");`
`791`		`- return DBErrors::TOO_NEW;`
	`791`	`+ return DBErrors::EXTERNAL_SIGNER_SUPPORT_REQUIRED;`
`792`	`792`	`}`
`793`	`793`	`#endif`
`794`	`794`