diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2016-01-28 05:09:29 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2016-01-29 01:31:33 +0000 |
| commit | 1205f87d36e70a29f30b2d05ddb80ac19d8ce398 (patch) | |
| tree | 306fadee99359ec45f89590eb2e54acb6e0f3b8d /src/main.cpp | |
| parent | cb83beb3759b9bd19cc13b1e3dd589349787ac3e (diff) | |
| download | bitcoin-1205f87d36e70a29f30b2d05ddb80ac19d8ce398.tar.xz | |
Rename permitrbf to replacebyfee
"permit" is currently used to configure transaction filtering, whereas replacement is more to do with the memory pool state than the transaction itself.
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index d1b0fbac2c..265d784900 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -75,7 +75,7 @@ bool fCheckpointsEnabled = DEFAULT_CHECKPOINTS_ENABLED; size_t nCoinCacheUsage = 5000 * 300; uint64_t nPruneTarget = 0; bool fAlerts = DEFAULT_ALERTS; -bool fPermitReplacement = DEFAULT_PERMIT_REPLACEMENT; +bool fEnableReplacement = DEFAULT_ENABLE_REPLACEMENT; /** Fees smaller than this (in satoshi) are considered zero fee (for relaying, mining and transaction creation) */ CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE); @@ -866,7 +866,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState &state, const C // unconfirmed ancestors anyway; doing otherwise is hopelessly // insecure. bool fReplacementOptOut = true; - if (fPermitReplacement) + if (fEnableReplacement) { BOOST_FOREACH(const CTxIn &txin, ptxConflicting->vin) { |