diff options
| author | fanquake <fanquake@gmail.com> | 2022-07-19 21:43:52 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-07-19 21:54:52 +0100 |
| commit | 5560682a4464852eb3c244c1ddf9eea02dc962b2 (patch) | |
| tree | ac226d4c05e7f86dee2b9d84620b9696b015e483 /src/node | |
| parent | 92c8e1849dceea6d4f7de2b58f4c50e5e50762ea (diff) | |
| parent | faf98aecf876fae0ec6d4d16b7e66f3a35253180 (diff) | |
| download | bitcoin-5560682a4464852eb3c244c1ddf9eea02dc962b2.tar.xz | |
Merge bitcoin/bitcoin#25645: refactor: Remove unused includes from dbwrapper.h
faf98aecf876fae0ec6d4d16b7e66f3a35253180 Remove unused includes in rpc/fees.cpp (MacroFake)
1111ddeedf7ea801507db4e23b4737ec183eb19c Remove unused includes from dbwrapper.h (MacroFake)
fa77fdd0475fa15a1a3641c5d5a2bf7ad095aa84 Add missing includes (MacroFake)
fa869ce2c2b906d8b087c4e7a5f1804a74b1c522 Add missing includes to node/chainstate (MacroFake)
Pull request description:
Unused includes are confusing, but also cause unrelated compile errors when the unused includes were to be removed.
Fix that by adding the missing includes where they are needed and then remove them where they are not needed. This is also checked by iwyu.
ACKs for top commit:
hebasto:
ACK faf98aecf876fae0ec6d4d16b7e66f3a35253180, I have reviewed the code and it looks OK, I agree it can be merged.
jarolrod:
Code Review ACK https://github.com/bitcoin/bitcoin/commit/faf98aecf876fae0ec6d4d16b7e66f3a35253180
Tree-SHA512: 75f3c6e6f6ecf8a98233e1a1463c75ca4e0eb3ec341150d274141072fe95413a3c2ec6386d1c527899cc63d43f63f5eb5991509847412773362808ddfb1bb435
Diffstat (limited to 'src/node')
| -rw-r--r-- | src/node/chainstate.cpp | 13 | ||||
| -rw-r--r-- | src/node/chainstate.h | 3 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp index 54ba5b7966..60a60f8665 100644 --- a/src/node/chainstate.cpp +++ b/src/node/chainstate.cpp @@ -4,10 +4,23 @@ #include <node/chainstate.h> +#include <chain.h> +#include <coins.h> #include <consensus/params.h> #include <node/blockstorage.h> +#include <sync.h> +#include <threadsafety.h> +#include <txdb.h> +#include <uint256.h> +#include <util/time.h> #include <validation.h> +#include <algorithm> +#include <atomic> +#include <cassert> +#include <memory> +#include <vector> + namespace node { std::optional<ChainstateLoadingError> LoadChainstate(bool fReset, ChainstateManager& chainman, diff --git a/src/node/chainstate.h b/src/node/chainstate.h index ff7935e8e0..5c495da229 100644 --- a/src/node/chainstate.h +++ b/src/node/chainstate.h @@ -11,9 +11,6 @@ class ChainstateManager; class CTxMemPool; -namespace Consensus { -struct Params; -} // namespace Consensus namespace node { enum class ChainstateLoadingError { |