aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/interfaces.cpp
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2021-12-23 15:16:24 +0100
committerMarcoFalke <falke.marco@gmail.com>2021-12-23 15:16:31 +0100
commitf7367b88e1c2cf1feca4d49f49b9616a5ad85a44 (patch)
tree7309d86ed2cd0793e7f8b7912bcf6c1ba30888b1 /src/wallet/interfaces.cpp
parentf5c678e5c3f013520078768027cc8ff860a15279 (diff)
parentff5f6dea5336075d1a6cace1112be3252d97540b (diff)
Merge bitcoin/bitcoin#23842: scripted-diff: Rename interfaces::WalletClient to interfaces::WalletLoader
ff5f6dea5336075d1a6cace1112be3252d97540b scripted-diff: Rename interfaces::WalletClient to interfaces::WalletLoader (Russell Yanofsky) Pull request description: Name has been confusing since it was introduced, and it was pointed in recent review club https://bitcoincore.reviews/10102 that it was particularly unclear how `interfaces::WalletClient` was different from `interfaces::Wallet`. ACKs for top commit: w0xlt: ACK ff5f6de Tree-SHA512: 26fa10baa457e76da1933adab187e9be61b8d76cff1cf2c73ad4320461c7e31fb9db07b7c2486998294826beb4a1aca255c14903920b443db6213e653c5f7e0a
Diffstat (limited to 'src/wallet/interfaces.cpp')
-rw-r--r--src/wallet/interfaces.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
index 04501ea5a2..54986413d6 100644
--- a/src/wallet/interfaces.cpp
+++ b/src/wallet/interfaces.cpp
@@ -40,7 +40,7 @@ using interfaces::MakeHandler;
using interfaces::Wallet;
using interfaces::WalletAddress;
using interfaces::WalletBalances;
-using interfaces::WalletClient;
+using interfaces::WalletLoader;
using interfaces::WalletOrderForm;
using interfaces::WalletTx;
using interfaces::WalletTxOut;
@@ -510,15 +510,15 @@ public:
std::shared_ptr<CWallet> m_wallet;
};
-class WalletClientImpl : public WalletClient
+class WalletLoaderImpl : public WalletLoader
{
public:
- WalletClientImpl(Chain& chain, ArgsManager& args)
+ WalletLoaderImpl(Chain& chain, ArgsManager& args)
{
m_context.chain = &chain;
m_context.args = &args;
}
- ~WalletClientImpl() override { UnloadWallets(m_context); }
+ ~WalletLoaderImpl() override { UnloadWallets(m_context); }
//! ChainClient methods
void registerRpcs() override
@@ -539,7 +539,7 @@ public:
void stop() override { return StopWallets(m_context); }
void setMockTime(int64_t time) override { return SetMockTime(time); }
- //! WalletClient methods
+ //! WalletLoader methods
std::unique_ptr<Wallet> createWallet(const std::string& name, const SecureString& passphrase, uint64_t wallet_creation_flags, bilingual_str& error, std::vector<bilingual_str>& warnings) override
{
std::shared_ptr<CWallet> wallet;
@@ -600,8 +600,8 @@ public:
namespace interfaces {
std::unique_ptr<Wallet> MakeWallet(WalletContext& context, const std::shared_ptr<CWallet>& wallet) { return wallet ? std::make_unique<wallet::WalletImpl>(context, wallet) : nullptr; }
-std::unique_ptr<WalletClient> MakeWalletClient(Chain& chain, ArgsManager& args)
+std::unique_ptr<WalletLoader> MakeWalletLoader(Chain& chain, ArgsManager& args)
{
- return std::make_unique<wallet::WalletClientImpl>(chain, args);
+ return std::make_unique<wallet::WalletLoaderImpl>(chain, args);
}
} // namespace interfaces