Skip to content

Commit f7367b8

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#23842: scripted-diff: Rename interfaces::WalletClient to interfaces::WalletLoader
ff5f6de 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
2 parents f5c678e + ff5f6de commit f7367b8

26 files changed

+62
-62
lines changed

‎src/dummywallet.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace interfaces {
1212
class Chain;
1313
class Handler;
1414
class Wallet;
15-
class WalletClient;
15+
class WalletLoader;
1616
}
1717

1818
class DummyWalletInit : public WalletInitInterface {
@@ -64,7 +64,7 @@ std::unique_ptr<Wallet> MakeWallet(const std::shared_ptr<CWallet>& wallet)
6464
throw std::logic_error("Wallet function called in non-wallet build.");
6565
}
6666

67-
std::unique_ptr<WalletClient> MakeWalletClient(Chain& chain, ArgsManager& args)
67+
std::unique_ptr<WalletLoader> MakeWalletLoader(Chain& chain, ArgsManager& args)
6868
{
6969
throw std::logic_error("Wallet function called in non-wallet build.");
7070
}

‎src/init/bitcoin-gui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ class BitcoinGuiInit : public interfaces::Init
2727
}
2828
std::unique_ptr<interfaces::Node> makeNode() override { return interfaces::MakeNode(m_node); }
2929
std::unique_ptr<interfaces::Chain> makeChain() override { return interfaces::MakeChain(m_node); }
30-
std::unique_ptr<interfaces::WalletClient> makeWalletClient(interfaces::Chain& chain) override
30+
std::unique_ptr<interfaces::WalletLoader> makeWalletLoader(interfaces::Chain& chain) override
3131
{
32-
return MakeWalletClient(chain, *Assert(m_node.args));
32+
return MakeWalletLoader(chain, *Assert(m_node.args));
3333
}
3434
std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
3535
interfaces::Ipc* ipc() override { return m_ipc.get(); }

‎src/init/bitcoin-node.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ class BitcoinNodeInit : public interfaces::Init
2929
}
3030
std::unique_ptr<interfaces::Node> makeNode() override { return interfaces::MakeNode(m_node); }
3131
std::unique_ptr<interfaces::Chain> makeChain() override { return interfaces::MakeChain(m_node); }
32-
std::unique_ptr<interfaces::WalletClient> makeWalletClient(interfaces::Chain& chain) override
32+
std::unique_ptr<interfaces::WalletLoader> makeWalletLoader(interfaces::Chain& chain) override
3333
{
34-
return MakeWalletClient(chain, *Assert(m_node.args));
34+
return MakeWalletLoader(chain, *Assert(m_node.args));
3535
}
3636
std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
3737
interfaces::Ipc* ipc() override { return m_ipc.get(); }

‎src/init/bitcoin-qt.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ class BitcoinQtInit : public interfaces::Init
2424
}
2525
std::unique_ptr<interfaces::Node> makeNode() override { return interfaces::MakeNode(m_node); }
2626
std::unique_ptr<interfaces::Chain> makeChain() override { return interfaces::MakeChain(m_node); }
27-
std::unique_ptr<interfaces::WalletClient> makeWalletClient(interfaces::Chain& chain) override
27+
std::unique_ptr<interfaces::WalletLoader> makeWalletLoader(interfaces::Chain& chain) override
2828
{
29-
return MakeWalletClient(chain, *Assert(m_node.args));
29+
return MakeWalletLoader(chain, *Assert(m_node.args));
3030
}
3131
std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
3232
NodeContext m_node;

‎src/init/bitcoind.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ class BitcoindInit : public interfaces::Init
2424
}
2525
std::unique_ptr<interfaces::Node> makeNode() override { return interfaces::MakeNode(m_node); }
2626
std::unique_ptr<interfaces::Chain> makeChain() override { return interfaces::MakeChain(m_node); }
27-
std::unique_ptr<interfaces::WalletClient> makeWalletClient(interfaces::Chain& chain) override
27+
std::unique_ptr<interfaces::WalletLoader> makeWalletLoader(interfaces::Chain& chain) override
2828
{
29-
return MakeWalletClient(chain, *Assert(m_node.args));
29+
return MakeWalletLoader(chain, *Assert(m_node.args));
3030
}
3131
std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
3232
NodeContext& m_node;

‎src/interfaces/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace interfaces {
1212
std::unique_ptr<Node> Init::makeNode() { return {}; }
1313
std::unique_ptr<Chain> Init::makeChain() { return {}; }
14-
std::unique_ptr<WalletClient> Init::makeWalletClient(Chain& chain) { return {}; }
14+
std::unique_ptr<WalletLoader> Init::makeWalletLoader(Chain& chain) { return {}; }
1515
std::unique_ptr<Echo> Init::makeEcho() { return {}; }
1616
Ipc* Init::ipc() { return nullptr; }
1717
} // namespace interfaces

‎src/interfaces/init.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Chain;
1414
class Echo;
1515
class Ipc;
1616
class Node;
17-
class WalletClient;
17+
class WalletLoader;
1818

1919
//! Initial interface created when a process is first started, and used to give
2020
//! and get access to other interfaces (Node, Chain, Wallet, etc).
@@ -29,7 +29,7 @@ class Init
2929
virtual ~Init() = default;
3030
virtual std::unique_ptr<Node> makeNode();
3131
virtual std::unique_ptr<Chain> makeChain();
32-
virtual std::unique_ptr<WalletClient> makeWalletClient(Chain& chain);
32+
virtual std::unique_ptr<WalletLoader> makeWalletLoader(Chain& chain);
3333
virtual std::unique_ptr<Echo> makeEcho();
3434
virtual Ipc* ipc();
3535
};

‎src/interfaces/node.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct bilingual_str;
3737

3838
namespace interfaces {
3939
class Handler;
40-
class WalletClient;
40+
class WalletLoader;
4141
struct BlockTip;
4242

4343
//! Block and header tip information
@@ -187,8 +187,8 @@ class Node
187187
//! Broadcast transaction.
188188
virtual TransactionError broadcastTransaction(CTransactionRef tx, CAmount max_tx_fee, std::string& err_string) = 0;
189189

190-
//! Get wallet client.
191-
virtual WalletClient& walletClient() = 0;
190+
//! Get wallet loader.
191+
virtual WalletLoader& walletLoader() = 0;
192192

193193
//! Register handler for init messages.
194194
using InitMessageFn = std::function<void(const std::string& message)>;
@@ -210,7 +210,7 @@ class Node
210210
using ShowProgressFn = std::function<void(const std::string& title, int progress, bool resume_possible)>;
211211
virtual std::unique_ptr<Handler> handleShowProgress(ShowProgressFn fn) = 0;
212212

213-
//! Register handler for wallet client constructed messages.
213+
//! Register handler for wallet loader constructed messages.
214214
using InitWalletFn = std::function<void()>;
215215
virtual std::unique_ptr<Handler> handleInitWallet(InitWalletFn fn) = 0;
216216

‎src/interfaces/wallet.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ class Wallet
313313
//! Wallet chain client that in addition to having chain client methods for
314314
//! starting up, shutting down, and registering RPCs, also has additional
315315
//! methods (called by the GUI) to load and create wallets.
316-
class WalletClient : public ChainClient
316+
class WalletLoader : public ChainClient
317317
{
318318
public:
319319
//! Create new wallet.
@@ -422,9 +422,9 @@ struct WalletTxOut
422422
//! dummywallet.cpp and throws if the wallet component is not compiled.
423423
std::unique_ptr<Wallet> MakeWallet(WalletContext& context, const std::shared_ptr<CWallet>& wallet);
424424

425-
//! Return implementation of ChainClient interface for a wallet client. This
425+
//! Return implementation of ChainClient interface for a wallet loader. This
426426
//! function will be undefined in builds where ENABLE_WALLET is false.
427-
std::unique_ptr<WalletClient> MakeWalletClient(Chain& chain, ArgsManager& args);
427+
std::unique_ptr<WalletLoader> MakeWalletLoader(Chain& chain, ArgsManager& args);
428428

429429
} // namespace interfaces
430430

‎src/node/context.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace interfaces {
2323
class Chain;
2424
class ChainClient;
2525
class Init;
26-
class WalletClient;
26+
class WalletLoader;
2727
} // namespace interfaces
2828

2929
//! NodeContext struct containing references to chain state and connection
@@ -52,7 +52,7 @@ struct NodeContext {
5252
std::vector<std::unique_ptr<interfaces::ChainClient>> chain_clients;
5353
//! Reference to chain client that should used to load or create wallets
5454
//! opened by the gui.
55-
interfaces::WalletClient* wallet_client{nullptr};
55+
interfaces::WalletLoader* wallet_loader{nullptr};
5656
std::unique_ptr<CScheduler> scheduler;
5757
std::function<void()> rpc_interruption_point = [] {};
5858

0 commit comments

Comments
 (0)