mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-11 22:50:59 +01:00
scripted-diff: Rename interfaces::WalletClient to interfaces::WalletLoader
Name has been confusing since it was introduced, and it was pointed in recent review club as https://bitcoincore.reviews/10102 that it was particularly unclear how interfaces::WalletClient was different from interfaces::Wallet. -BEGIN VERIFY SCRIPT- ren() { git grep -l "$1" src | xargs sed -i "s/$1/$2/g"; } ren WalletClient WalletLoader ren walletClient walletLoader ren wallet_client wallet_loader ren "wallet clients release the wallet" "wallet pointer owners release the wallet" ren "wallet client" "wallet loader" ren "Wallet client" "Wallet loader" -END VERIFY SCRIPT-
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
namespace interfaces {
|
||||
std::unique_ptr<Node> Init::makeNode() { return {}; }
|
||||
std::unique_ptr<Chain> Init::makeChain() { return {}; }
|
||||
std::unique_ptr<WalletClient> Init::makeWalletClient(Chain& chain) { return {}; }
|
||||
std::unique_ptr<WalletLoader> Init::makeWalletLoader(Chain& chain) { return {}; }
|
||||
std::unique_ptr<Echo> Init::makeEcho() { return {}; }
|
||||
Ipc* Init::ipc() { return nullptr; }
|
||||
} // namespace interfaces
|
||||
|
||||
@@ -14,7 +14,7 @@ class Chain;
|
||||
class Echo;
|
||||
class Ipc;
|
||||
class Node;
|
||||
class WalletClient;
|
||||
class WalletLoader;
|
||||
|
||||
//! Initial interface created when a process is first started, and used to give
|
||||
//! and get access to other interfaces (Node, Chain, Wallet, etc).
|
||||
@@ -29,7 +29,7 @@ public:
|
||||
virtual ~Init() = default;
|
||||
virtual std::unique_ptr<Node> makeNode();
|
||||
virtual std::unique_ptr<Chain> makeChain();
|
||||
virtual std::unique_ptr<WalletClient> makeWalletClient(Chain& chain);
|
||||
virtual std::unique_ptr<WalletLoader> makeWalletLoader(Chain& chain);
|
||||
virtual std::unique_ptr<Echo> makeEcho();
|
||||
virtual Ipc* ipc();
|
||||
};
|
||||
|
||||
@@ -37,7 +37,7 @@ struct bilingual_str;
|
||||
|
||||
namespace interfaces {
|
||||
class Handler;
|
||||
class WalletClient;
|
||||
class WalletLoader;
|
||||
struct BlockTip;
|
||||
|
||||
//! Block and header tip information
|
||||
@@ -187,8 +187,8 @@ public:
|
||||
//! Broadcast transaction.
|
||||
virtual TransactionError broadcastTransaction(CTransactionRef tx, CAmount max_tx_fee, std::string& err_string) = 0;
|
||||
|
||||
//! Get wallet client.
|
||||
virtual WalletClient& walletClient() = 0;
|
||||
//! Get wallet loader.
|
||||
virtual WalletLoader& walletLoader() = 0;
|
||||
|
||||
//! Register handler for init messages.
|
||||
using InitMessageFn = std::function<void(const std::string& message)>;
|
||||
@@ -210,7 +210,7 @@ public:
|
||||
using ShowProgressFn = std::function<void(const std::string& title, int progress, bool resume_possible)>;
|
||||
virtual std::unique_ptr<Handler> handleShowProgress(ShowProgressFn fn) = 0;
|
||||
|
||||
//! Register handler for wallet client constructed messages.
|
||||
//! Register handler for wallet loader constructed messages.
|
||||
using InitWalletFn = std::function<void()>;
|
||||
virtual std::unique_ptr<Handler> handleInitWallet(InitWalletFn fn) = 0;
|
||||
|
||||
|
||||
@@ -313,7 +313,7 @@ public:
|
||||
//! Wallet chain client that in addition to having chain client methods for
|
||||
//! starting up, shutting down, and registering RPCs, also has additional
|
||||
//! methods (called by the GUI) to load and create wallets.
|
||||
class WalletClient : public ChainClient
|
||||
class WalletLoader : public ChainClient
|
||||
{
|
||||
public:
|
||||
//! Create new wallet.
|
||||
@@ -422,9 +422,9 @@ struct WalletTxOut
|
||||
//! dummywallet.cpp and throws if the wallet component is not compiled.
|
||||
std::unique_ptr<Wallet> MakeWallet(WalletContext& context, const std::shared_ptr<CWallet>& wallet);
|
||||
|
||||
//! Return implementation of ChainClient interface for a wallet client. This
|
||||
//! Return implementation of ChainClient interface for a wallet loader. This
|
||||
//! function will be undefined in builds where ENABLE_WALLET is false.
|
||||
std::unique_ptr<WalletClient> MakeWalletClient(Chain& chain, ArgsManager& args);
|
||||
std::unique_ptr<WalletLoader> MakeWalletLoader(Chain& chain, ArgsManager& args);
|
||||
|
||||
} // namespace interfaces
|
||||
|
||||
|
||||
Reference in New Issue
Block a user