aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2015-10-27 17:21:43 +0100
committerMarcoFalke <falke.marco@gmail.com>2015-11-09 21:00:16 +0100
commit536766c903c8dc84e6709e4bd387aad5acf8e433 (patch)
tree4534cad8d5959d8791f1ed016f9717e787e7ab7e
parent5f46a7d0689ff1457b016fdf0de89e5153058864 (diff)
[trivial] New DEFAULT_MIN_RELAY_TX_FEE = 1000
-rw-r--r--src/main.cpp2
-rw-r--r--src/main.h2
-rw-r--r--src/test/transaction_tests.cpp2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 9016fe42a0..9212b309da 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -75,7 +75,7 @@ uint64_t nPruneTarget = 0;
bool fAlerts = DEFAULT_ALERTS;
/** Fees smaller than this (in satoshi) are considered zero fee (for relaying, mining and transaction creation) */
-CFeeRate minRelayTxFee = CFeeRate(1000);
+CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
CTxMemPool mempool(::minRelayTxFee);
diff --git a/src/main.h b/src/main.h
index 273a450867..0a7944092a 100644
--- a/src/main.h
+++ b/src/main.h
@@ -41,6 +41,8 @@ struct CNodeStateStats;
/** Default for accepting alerts from the P2P network. */
static const bool DEFAULT_ALERTS = true;
+/** Default for -minrelaytxfee, minimum relay fee for transactions */
+static const unsigned int DEFAULT_MIN_RELAY_TX_FEE = 1000;
/** Default for -maxorphantx, maximum number of orphan transactions kept in memory */
static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100;
/** Default for -limitancestorcount, max number of in-mempool ancestors */
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index c840f4c9fd..fb0df1aff4 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -361,7 +361,7 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
// not dust:
t.vout[0].nValue = 672;
BOOST_CHECK(IsStandardTx(t, reason));
- minRelayTxFee = CFeeRate(1000);
+ minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
t.vout[0].scriptPubKey = CScript() << OP_1;
BOOST_CHECK(!IsStandardTx(t, reason));