foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-13 11:25:02 -05:00
Code Issues Activity

refactor: unify external wallet runtime errors

Browse source 
Rather than 3 different messages that are confusing / leak
implementation details, use a single message, that is similar to other
wallet related messages. i.e:
"Compiled without sqlite support (required for descriptor wallets)".
This commit is contained in:
fanquake 2021-04-13 15:08:33 +08:00
parent f4652bf125
commit 8fdbb899b8
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/wallet/rpcwallet.cpp
View file

@ -2750,7 +2750,7 @@ static RPCHelpMan createwallet()
#ifdef ENABLE_EXTERNAL_SIGNER #ifdef ENABLE_EXTERNAL_SIGNER
flags |= WALLET_FLAG_EXTERNAL_SIGNER; flags |= WALLET_FLAG_EXTERNAL_SIGNER;
#else #else
throw JSONRPCError(RPC_WALLET_ERROR, "Configure with --enable-external-signer to use this"); throw JSONRPCError(RPC_WALLET_ERROR, "Compiled without external signing support (required for external signing)");
#endif #endif
} }

4
src/wallet/wallet.cpp
View file

@ -4516,7 +4516,7 @@ void CWallet::LoadDescriptorScriptPubKeyMan(uint256 id, WalletDescriptor& desc)
auto spk_manager = std::unique_ptr<ScriptPubKeyMan>(new ExternalSignerScriptPubKeyMan(*this, desc)); auto spk_manager = std::unique_ptr<ScriptPubKeyMan>(new ExternalSignerScriptPubKeyMan(*this, desc));
m_spk_managers[id] = std::move(spk_manager); m_spk_managers[id] = std::move(spk_manager);
#else #else
throw std::runtime_error(std::string(__func__) + ": Configure with --enable-external-signer to use external signer wallets"); throw std::runtime_error(std::string(__func__) + ": Compiled without external signing support (required for external signing)");
#endif #endif
} else { } else {
auto spk_manager = std::unique_ptr<ScriptPubKeyMan>(new DescriptorScriptPubKeyMan(*this, desc)); auto spk_manager = std::unique_ptr<ScriptPubKeyMan>(new DescriptorScriptPubKeyMan(*this, desc));
@ -4585,7 +4585,7 @@ void CWallet::SetupDescriptorScriptPubKeyMans()
} }
} }
#else #else
throw std::runtime_error(std::string(__func__) + ": Wallets with external signers require Boost::Process library."); throw std::runtime_error(std::string(__func__) + ": Compiled without external signing support (required for external signing)");
#endif // ENABLE_EXTERNAL_SIGNER #endif // ENABLE_EXTERNAL_SIGNER
} }
} }