diff options
author | fanquake <fanquake@gmail.com> | 2023-08-22 10:16:20 +0100 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2023-08-22 10:34:10 +0100 |
commit | 00fc7cdc2558c6766412a0c57870ed460f02e1d0 (patch) | |
tree | 18088ea35352ab2638d87f9973909dcce05057dd /src/wallet | |
parent | c00bc6306163197793d9ff52513fca430c6cae72 (diff) | |
parent | fa6286891fa4164510e4fbf4bc214ce3033b2d1b (diff) |
Merge bitcoin/bitcoin#28200: refactor: Remove unused includes from wallet.cpp
fa6286891fa4164510e4fbf4bc214ce3033b2d1b Remove unused includes from wallet.cpp (MarcoFalke)
fa8fdbe22932a4717d2bc4060269da9bff228728 Remove unused includes from blockfilter.h (MarcoFalke)
fad8c36aa9011c3f7b1183f8380577e16a2167a6 move-only: Create src/kernel/mempool_removal_reason.h (MarcoFalke)
fa5760880094c4e4238249f6d1837cd74383cc3a Remove unused includes from txmempool.h (MarcoFalke)
Pull request description:
This makes compilation of wallet.cpp use a few % less memory and time, locally.
Created in the context of https://github.com/bitcoin/bitcoin/issues/28109, but I don't think it is enough to actually fix this problem.
ACKs for top commit:
hebasto:
ACK fa6286891fa4164510e4fbf4bc214ce3033b2d1b, I have reviewed the code and it looks OK.
Tree-SHA512: 06f1120af2a8ef3368dbd9ae747acda88ace2507bd261bcc10341d476a0b3d71c8485377ea6c108b47df3e4c13b7f75a15f486bafa6a8466303168dde16ebbc8
Diffstat (limited to 'src/wallet')
-rw-r--r-- | src/wallet/test/util.cpp | 1 | ||||
-rw-r--r-- | src/wallet/test/wallet_tests.cpp | 1 | ||||
-rw-r--r-- | src/wallet/wallet.cpp | 51 | ||||
-rw-r--r-- | src/wallet/wallet.h | 51 |
4 files changed, 80 insertions, 24 deletions
diff --git a/src/wallet/test/util.cpp b/src/wallet/test/util.cpp index 069ab25f26..ad8613d515 100644 --- a/src/wallet/test/util.cpp +++ b/src/wallet/test/util.cpp @@ -9,6 +9,7 @@ #include <key_io.h> #include <streams.h> #include <test/util/setup_common.h> +#include <validationinterface.h> #include <wallet/context.h> #include <wallet/wallet.h> #include <wallet/walletdb.h> diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index 4abf6441d2..5c297d76e4 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -21,6 +21,7 @@ #include <test/util/setup_common.h> #include <util/translation.h> #include <validation.h> +#include <validationinterface.h> #include <wallet/coincontrol.h> #include <wallet/context.h> #include <wallet/receive.h> diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 52f6e8e243..e77dd676e0 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -5,51 +5,82 @@ #include <wallet/wallet.h> +#if defined(HAVE_CONFIG_H) +#include <config/bitcoin-config.h> +#endif +#include <addresstype.h> #include <blockfilter.h> #include <chain.h> +#include <coins.h> #include <common/args.h> +#include <common/settings.h> +#include <common/system.h> #include <consensus/amount.h> #include <consensus/consensus.h> #include <consensus/validation.h> #include <external_signer.h> #include <interfaces/chain.h> +#include <interfaces/handler.h> #include <interfaces/wallet.h> +#include <kernel/mempool_removal_reason.h> #include <key.h> #include <key_io.h> +#include <logging.h> #include <outputtype.h> -#include <policy/fees.h> -#include <policy/policy.h> +#include <policy/feerate.h> #include <primitives/block.h> #include <primitives/transaction.h> #include <psbt.h> +#include <pubkey.h> #include <random.h> #include <script/descriptor.h> +#include <script/interpreter.h> #include <script/script.h> +#include <script/sign.h> #include <script/signingprovider.h> #include <script/solver.h> +#include <serialize.h> +#include <span.h> +#include <streams.h> +#include <support/allocators/secure.h> +#include <support/allocators/zeroafterfree.h> #include <support/cleanse.h> -#include <txmempool.h> -#include <util/bip32.h> +#include <sync.h> +#include <tinyformat.h> +#include <uint256.h> +#include <univalue.h> #include <util/check.h> #include <util/error.h> -#include <util/fees.h> #include <util/fs.h> #include <util/fs_helpers.h> +#include <util/message.h> #include <util/moneystr.h> -#include <util/rbf.h> +#include <util/result.h> #include <util/string.h> +#include <util/time.h> #include <util/translation.h> #include <wallet/coincontrol.h> #include <wallet/context.h> +#include <wallet/crypter.h> +#include <wallet/db.h> #include <wallet/external_signer_scriptpubkeyman.h> -#include <wallet/fees.h> #include <wallet/scriptpubkeyman.h> - -#include <univalue.h> +#include <wallet/transaction.h> +#include <wallet/types.h> +#include <wallet/walletdb.h> +#include <wallet/walletutil.h> #include <algorithm> -#include <assert.h> +#include <cassert> +#include <condition_variable> +#include <exception> #include <optional> +#include <stdexcept> +#include <thread> +#include <tuple> +#include <variant> + +struct KeyOriginInfo; using interfaces::FoundBlock; diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index e2be6a206a..da58c9e876 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -10,47 +10,72 @@ #include <consensus/amount.h> #include <interfaces/chain.h> #include <interfaces/handler.h> -#include <interfaces/wallet.h> +#include <kernel/cs_main.h> #include <logging.h> #include <outputtype.h> #include <policy/feerate.h> -#include <psbt.h> +#include <primitives/transaction.h> +#include <script/interpreter.h> +#include <script/script.h> +#include <support/allocators/secure.h> +#include <sync.h> #include <tinyformat.h> +#include <uint256.h> #include <util/fs.h> #include <util/hasher.h> -#include <util/message.h> #include <util/result.h> -#include <util/strencodings.h> #include <util/string.h> #include <util/time.h> #include <util/ui_change_type.h> -#include <validationinterface.h> #include <wallet/crypter.h> +#include <wallet/db.h> #include <wallet/scriptpubkeyman.h> #include <wallet/transaction.h> -#include <wallet/walletdb.h> +#include <wallet/types.h> #include <wallet/walletutil.h> -#include <algorithm> #include <atomic> +#include <cassert> +#include <cstddef> +#include <cstdint> +#include <functional> +#include <limits> #include <map> #include <memory> #include <optional> #include <set> -#include <stdexcept> -#include <stdint.h> #include <string> -#include <utility> #include <unordered_map> +#include <utility> #include <vector> #include <boost/signals2/signal.hpp> +class CKey; +class CKeyID; +class CPubKey; +class Coin; +class SigningProvider; +enum class MemPoolRemovalReason; +enum class SigningResult; +enum class TransactionError; +namespace interfaces { +class Wallet; +} +namespace wallet { +class CWallet; +class WalletBatch; +enum class DBErrors : int; +} // namespace wallet +struct CBlockLocator; +struct CExtKey; +struct FlatSigningProvider; +struct KeyOriginInfo; +struct PartiallySignedTransaction; +struct SignatureData; using LoadWalletFn = std::function<void(std::unique_ptr<interfaces::Wallet> wallet)>; -class CScript; -enum class FeeEstimateMode; struct bilingual_str; namespace wallet { @@ -119,8 +144,6 @@ constexpr CAmount HIGH_MAX_TX_FEE{100 * HIGH_TX_FEE_PER_KB}; static constexpr size_t DUMMY_NESTED_P2WPKH_INPUT_SIZE = 91; class CCoinControl; -class CWalletTx; -class ReserveDestination; //! Default for -addresstype constexpr OutputType DEFAULT_ADDRESS_TYPE{OutputType::BECH32}; |