diff options
author | MacroFake <falke.marco@gmail.com> | 2022-06-07 11:31:02 +0200 |
---|---|---|
committer | MacroFake <falke.marco@gmail.com> | 2022-06-07 11:31:10 +0200 |
commit | 2ab4a80480b6d538ec2a642f7f96c635c725317b (patch) | |
tree | ded0d645520e26af945fabcdf3389efa88fa9e6d /src/net_processing.cpp | |
parent | f66633d9cbe79f4ef4048fca6f16d914d257f77c (diff) | |
parent | fa4068b4e2192f168bb120624eca5735f0dadf6f (diff) | |
download | bitcoin-2ab4a80480b6d538ec2a642f7f96c635c725317b.tar.xz |
Merge bitcoin/bitcoin#25254: Move minRelayTxFee to policy/settings
fa4068b4e2192f168bb120624eca5735f0dadf6f Move minRelayTxFee to policy/settings (MacroFake)
Pull request description:
Seems a bit confusing to put policy stuff into validation, so fix that.
Also fix includes via `iwyu`.
ACKs for top commit:
ariard:
ACK fa4068b, the includes move compiles well locally.
ryanofsky:
Code review ACK fa4068b4e2192f168bb120624eca5735f0dadf6f. Make sense to move the global variable to policy/settings and the default constant to policy/policy. Ariard points out other constants that could be moved, which seems fine, but it seems like moving the global variable to be with other related global variables is more significant.
Tree-SHA512: adf9619002610d1877f3aef0a9e6115fc4c2ad64135a3e5100824c650b560c47f47ac28894c6214a50a7888355252a9f6f7cec98c23a771a1964160ef1ca77de
Diffstat (limited to 'src/net_processing.cpp')
-rw-r--r-- | src/net_processing.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 70b81b3eb2..30d5548385 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -21,6 +21,7 @@ #include <node/blockstorage.h> #include <policy/fees.h> #include <policy/policy.h> +#include <policy/settings.h> #include <primitives/block.h> #include <primitives/transaction.h> #include <random.h> |