diff options
author | Russell Yanofsky <russ@yanofsky.org> | 2021-12-22 13:44:55 -0500 |
---|---|---|
committer | Russell Yanofsky <russ@yanofsky.org> | 2021-12-22 13:44:55 -0500 |
commit | ff5f6dea5336075d1a6cace1112be3252d97540b (patch) | |
tree | e0faca531b734898819ad03ed0b06332229dd4aa /src/node | |
parent | 63b5dfac21613b984803347bfe81454da667016e (diff) | |
download | bitcoin-ff5f6dea5336075d1a6cace1112be3252d97540b.tar.xz |
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-
Diffstat (limited to 'src/node')
-rw-r--r-- | src/node/context.h | 4 | ||||
-rw-r--r-- | src/node/interfaces.cpp | 6 | ||||
-rw-r--r-- | src/node/ui_interface.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/node/context.h b/src/node/context.h index 26873345b4..e0f85ec6fc 100644 --- a/src/node/context.h +++ b/src/node/context.h @@ -23,7 +23,7 @@ namespace interfaces { class Chain; class ChainClient; class Init; -class WalletClient; +class WalletLoader; } // namespace interfaces //! NodeContext struct containing references to chain state and connection @@ -52,7 +52,7 @@ struct NodeContext { std::vector<std::unique_ptr<interfaces::ChainClient>> chain_clients; //! Reference to chain client that should used to load or create wallets //! opened by the gui. - interfaces::WalletClient* wallet_client{nullptr}; + interfaces::WalletLoader* wallet_loader{nullptr}; std::unique_ptr<CScheduler> scheduler; std::function<void()> rpc_interruption_point = [] {}; diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp index 8109dce2c0..21bfdff5da 100644 --- a/src/node/interfaces.cpp +++ b/src/node/interfaces.cpp @@ -63,7 +63,7 @@ using interfaces::FoundBlock; using interfaces::Handler; using interfaces::MakeHandler; using interfaces::Node; -using interfaces::WalletClient; +using interfaces::WalletLoader; namespace node { namespace { @@ -280,9 +280,9 @@ public: { return BroadcastTransaction(*m_context, std::move(tx), err_string, max_tx_fee, /*relay=*/ true, /*wait_callback=*/ false); } - WalletClient& walletClient() override + WalletLoader& walletLoader() override { - return *Assert(m_context->wallet_client); + return *Assert(m_context->wallet_loader); } std::unique_ptr<Handler> handleInitMessage(InitMessageFn fn) override { diff --git a/src/node/ui_interface.h b/src/node/ui_interface.h index f969bcde21..5e11b08976 100644 --- a/src/node/ui_interface.h +++ b/src/node/ui_interface.h @@ -82,7 +82,7 @@ public: /** Progress message during initialization. */ ADD_SIGNALS_DECL_WRAPPER(InitMessage, void, const std::string& message); - /** Wallet client created. */ + /** Wallet loader created. */ ADD_SIGNALS_DECL_WRAPPER(InitWallet, void, ); /** Number of network connections changed. */ |