diff options
author | John Newbery <john@johnnewbery.com> | 2019-04-02 14:14:58 -0400 |
---|---|---|
committer | John Newbery <john@johnnewbery.com> | 2019-04-09 17:53:08 -0400 |
commit | 4a75c9d6512a5580e60104103ea11d2cd9586354 (patch) | |
tree | 03928bbefeff422d8be4fa400c88be34c1150328 /src/policy/policy.cpp | |
parent | fdf8888b6f0c63e8a4cb1459752625e642d6a4dd (diff) | |
download | bitcoin-4a75c9d6512a5580e60104103ea11d2cd9586354.tar.xz |
[build] Move policy settings to new src/policy/settings unit
This moves the following policy settings functions and globals to a new
src/policy/settings unit in lib_server:
- `incrementalRelayFee`
- `dustRelayFee`
- `nBytesPerSigOp`
- `fIsBareMultisigStd`
These settings are only required by the node and should not be accessed
by other libraries.
Diffstat (limited to 'src/policy/policy.cpp')
-rw-r--r-- | src/policy/policy.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index d4cc538492..f1e6aadb5a 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -10,6 +10,7 @@ #include <consensus/validation.h> #include <validation.h> #include <coins.h> +#include <policy/settings.h> #include <tinyformat.h> #include <util/system.h> #include <util/strencodings.h> @@ -239,10 +240,6 @@ bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs) return true; } -CFeeRate incrementalRelayFee = CFeeRate(DEFAULT_INCREMENTAL_RELAY_FEE); -CFeeRate dustRelayFee = CFeeRate(DUST_RELAY_TX_FEE); -unsigned int nBytesPerSigOp = DEFAULT_BYTES_PER_SIGOP; - int64_t GetVirtualTransactionSize(int64_t nWeight, int64_t nSigOpCost) { return (std::max(nWeight, nSigOpCost * nBytesPerSigOp) + WITNESS_SCALE_FACTOR - 1) / WITNESS_SCALE_FACTOR; |