aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Corallo <git@bluematt.me>2017-01-09 14:11:15 -0500
committerMatt Corallo <git@bluematt.me>2017-01-09 14:15:18 -0500
commitc73554042886fb63fb48edf29cf827951edde341 (patch)
tree0e39f29c4109e7dea62ce51296d1aac9f3a499fe
parent07fd147b9f12e9205afd66a624edce357977d615 (diff)
Move ORPHAN constants from validation.h to net_processing.h
-rw-r--r--src/net_processing.h7
-rw-r--r--src/validation.h6
2 files changed, 7 insertions, 6 deletions
diff --git a/src/net_processing.h b/src/net_processing.h
index 230d805bd4..92ea21df72 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -9,6 +9,13 @@
#include "net.h"
#include "validationinterface.h"
+/** Default for -maxorphantx, maximum number of orphan transactions kept in memory */
+static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100;
+/** Expiration time for orphan transactions in seconds */
+static const int64_t ORPHAN_TX_EXPIRE_TIME = 20 * 60;
+/** Minimum time between orphan transactions expire time checks in seconds */
+static const int64_t ORPHAN_TX_EXPIRE_INTERVAL = 5 * 60;
+
/** Register with a network node to receive its signals */
void RegisterNodeSignals(CNodeSignals& nodeSignals);
/** Unregister a network node */
diff --git a/src/validation.h b/src/validation.h
index 631602a701..7848c787aa 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -58,12 +58,6 @@ static const CAmount DEFAULT_TRANSACTION_MAXFEE = 0.1 * COIN;
static const CAmount HIGH_TX_FEE_PER_KB = 0.01 * COIN;
//! -maxtxfee will warn if called with a higher fee than this amount (in satoshis)
static const CAmount HIGH_MAX_TX_FEE = 100 * HIGH_TX_FEE_PER_KB;
-/** Default for -maxorphantx, maximum number of orphan transactions kept in memory */
-static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100;
-/** Expiration time for orphan transactions in seconds */
-static const int64_t ORPHAN_TX_EXPIRE_TIME = 20 * 60;
-/** Minimum time between orphan transactions expire time checks in seconds */
-static const int64_t ORPHAN_TX_EXPIRE_INTERVAL = 5 * 60;
/** Default for -limitancestorcount, max number of in-mempool ancestors */
static const unsigned int DEFAULT_ANCESTOR_LIMIT = 25;
/** Default for -limitancestorsize, maximum kilobytes of tx + all in-mempool ancestors */