diff options
| author | glozow <gloriajzhao@gmail.com> | 2022-11-18 16:24:08 -0800 |
|---|---|---|
| committer | glozow <gloriajzhao@gmail.com> | 2022-11-18 17:04:49 -0800 |
| commit | d0b1f613c2a20b2de2878be2de19f827347dcc24 (patch) | |
| tree | 66d11b55b0ad7a3e2c500aec026a012e57dbf0a8 /src/test | |
| parent | aeb395dcdbfe2b1a6c77ff218939a18afde3add9 (diff) | |
| parent | c8dc0e3eaa9e0f956c5177bcb69632beb0d51770 (diff) | |
Merge bitcoin/bitcoin#17786: refactor: Nuke policy/fees->mempool circular dependencies
c8dc0e3eaa9e0f956c5177bcb69632beb0d51770 refactor: Inline `CTxMemPoolEntry` class's functions (Hennadii Stepanov)
75bbe594e54402ed248ecf2bdfe54e8283d20fff refactor: Move `CTxMemPoolEntry` class to its own module (Hennadii Stepanov)
Pull request description:
This PR:
- gets rid of the `policy/fees` -> `txmempool` -> `policy/fees` circular dependency
- is an alternative to #13949, which nukes only one circular dependency
ACKs for top commit:
ryanofsky:
Code review ACK c8dc0e3eaa9e0f956c5177bcb69632beb0d51770. Just include and whitespace changes since last review, and there's a moveonly commit now so it's very easy to review
theStack:
Code-review ACK c8dc0e3eaa9e0f956c5177bcb69632beb0d51770
glozow:
utACK c8dc0e3eaa9e0f956c5177bcb69632beb0d51770, agree these changes are an improvement.
Tree-SHA512: 36ece824e6ed3ab1a1e198b30a906c8ac12de24545f840eb046958a17315ac9260c7de26e11e2fbab7208adc3d74918db7a7e389444130f8810548ca2e81af41
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/fuzz/policy_estimator.cpp | 1 | ||||
| -rw-r--r-- | src/test/fuzz/util/mempool.cpp | 2 | ||||
| -rw-r--r-- | src/test/util/setup_common.cpp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/test/fuzz/policy_estimator.cpp b/src/test/fuzz/policy_estimator.cpp index a3d57dbdd5..3788c36455 100644 --- a/src/test/fuzz/policy_estimator.cpp +++ b/src/test/fuzz/policy_estimator.cpp @@ -11,6 +11,7 @@ #include <test/fuzz/util/mempool.h> #include <test/util/setup_common.h> #include <txmempool.h> +#include <txmempool_entry.h> #include <cstdint> #include <optional> diff --git a/src/test/fuzz/util/mempool.cpp b/src/test/fuzz/util/mempool.cpp index d0053f77d2..ac83f6ca21 100644 --- a/src/test/fuzz/util/mempool.cpp +++ b/src/test/fuzz/util/mempool.cpp @@ -7,7 +7,7 @@ #include <test/fuzz/FuzzedDataProvider.h> #include <test/fuzz/util.h> #include <test/fuzz/util/mempool.h> -#include <txmempool.h> +#include <txmempool_entry.h> #include <limits> diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index bdcff1076b..a7ca97222a 100644 --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -41,6 +41,7 @@ #include <timedata.h> #include <txdb.h> #include <txmempool.h> +#include <txmempool_entry.h> #include <util/strencodings.h> #include <util/string.h> #include <util/thread.h> |