diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-12-09 13:44:11 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-12-09 13:44:24 +0100 |
| commit | 7ce8d74156abab75ee23eeac74a7b31cce64147a (patch) | |
| tree | 8ca0d23ff4890a44e27757c793468f8a1060f817 | |
| parent | 7908772244b90884249da90e05f0044cc7d555dd (diff) | |
| parent | 3431839c33fa3892c982322e4add39e28ddba719 (diff) | |
| download | bitcoin-7ce8d74156abab75ee23eeac74a7b31cce64147a.tar.xz | |
Merge bitcoin/bitcoin#23346: util, refactor: Improve headers for bitcoin-wallet tool
3431839c33fa3892c982322e4add39e28ddba719 util, refactor: Improve headers for bitcoin-wallet tool (Hennadii Stepanov)
Pull request description:
This PR:
- removes unneeded `#include <wallet/wallet.h>` from `<wallet/wallettool.h>`
- introduces class forward declaration in `<wallet/wallettool.h>`
- added `#include <config/bitcoin-config.h>` to `wallet/wallettool.cpp` where the `USE_BDB` macro is used
Top commit has no ACKs.
Tree-SHA512: a0de560d821f8b570ae806a1165b9b382c9e0b339687d932052fa4c38ab2ba493e7e050f19adc02ad7db40c42cf88ac1d37209f9071494a0ab268ed33ff22b9f
| -rw-r--r-- | src/bitcoin-wallet.cpp | 7 | ||||
| -rw-r--r-- | src/wallet/wallettool.cpp | 6 | ||||
| -rw-r--r-- | src/wallet/wallettool.h | 5 |
3 files changed, 16 insertions, 2 deletions
diff --git a/src/bitcoin-wallet.cpp b/src/bitcoin-wallet.cpp index afa5b99549..3c8dbeaa21 100644 --- a/src/bitcoin-wallet.cpp +++ b/src/bitcoin-wallet.cpp @@ -8,14 +8,21 @@ #include <chainparams.h> #include <chainparamsbase.h> +#include <clientversion.h> #include <interfaces/init.h> +#include <key.h> #include <logging.h> +#include <pubkey.h> +#include <tinyformat.h> #include <util/system.h> #include <util/translation.h> #include <util/url.h> #include <wallet/wallettool.h> +#include <exception> #include <functional> +#include <string> +#include <tuple> const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr; UrlDecodeFn* const URL_DECODE = nullptr; diff --git a/src/wallet/wallettool.cpp b/src/wallet/wallettool.cpp index d6717ebbca..d3207fe460 100644 --- a/src/wallet/wallettool.cpp +++ b/src/wallet/wallettool.cpp @@ -2,6 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include <config/bitcoin-config.h> +#endif + +#include <wallet/wallettool.h> + #include <fs.h> #include <util/system.h> #include <util/translation.h> diff --git a/src/wallet/wallettool.h b/src/wallet/wallettool.h index f4516bb5bc..09be1dac2c 100644 --- a/src/wallet/wallettool.h +++ b/src/wallet/wallettool.h @@ -5,11 +5,12 @@ #ifndef BITCOIN_WALLET_WALLETTOOL_H #define BITCOIN_WALLET_WALLETTOOL_H -#include <wallet/wallet.h> +#include <string> + +class ArgsManager; namespace WalletTool { -void WalletShowInfo(CWallet* wallet_instance); bool ExecuteWalletToolFunc(const ArgsManager& args, const std::string& command); } // namespace WalletTool |