aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-06-11 14:22:00 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2017-06-11 14:22:40 +0200
commit562caf1c74fd263fa1b3622dee84cc7b5425a5b8 (patch)
tree7b867102833697e81e737b7b5b0549e9337f96fa
parent2e7d8f8b7d98b9d60a6304e2853df23301cbd600 (diff)
parentdce82397c1540769a8b39a9a475c366cb9438469 (diff)
Merge #10560: Remove unused constants
dce8239 Comment out unused constant REJECT_DUST (practicalswift) 3289ef4 Remove unused constant MEMPOOL_GD_VERSION (practicalswift) Tree-SHA512: 8dd772c963037cd0a1db0d5bf5f7a5cce3f5cd8fb6fa983949f9f0c1c8312ffd251a62c1e5d32f3584d2bcc562d8c8a9bf7900609dee9a4f12898caa2be9c38f
-rw-r--r--src/consensus/validation.h2
-rw-r--r--src/version.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/src/consensus/validation.h b/src/consensus/validation.h
index 5a7d7f11a9..8fc3ef1b66 100644
--- a/src/consensus/validation.h
+++ b/src/consensus/validation.h
@@ -14,7 +14,7 @@ static const unsigned char REJECT_INVALID = 0x10;
static const unsigned char REJECT_OBSOLETE = 0x11;
static const unsigned char REJECT_DUPLICATE = 0x12;
static const unsigned char REJECT_NONSTANDARD = 0x40;
-static const unsigned char REJECT_DUST = 0x41;
+// static const unsigned char REJECT_DUST = 0x41; // part of BIP 61
static const unsigned char REJECT_INSUFFICIENTFEE = 0x42;
static const unsigned char REJECT_CHECKPOINT = 0x43;
diff --git a/src/version.h b/src/version.h
index 0f69b2f02b..d528212490 100644
--- a/src/version.h
+++ b/src/version.h
@@ -27,9 +27,6 @@ static const int CADDR_TIME_VERSION = 31402;
//! BIP 0031, pong message, is enabled for all versions AFTER this one
static const int BIP0031_VERSION = 60000;
-//! "mempool" command, enhanced "getdata" behavior starts with this version
-static const int MEMPOOL_GD_VERSION = 60002;
-
//! "filter*" commands are disabled without NODE_BLOOM after and including this version
static const int NO_BLOOM_VERSION = 70011;