From 9dbfaf312791a6ea7a53c9f00d2d10308f34ea10 Mon Sep 17 00:00:00 2001
From: Christopher Jeffrey <chjjeffrey@gmail.com>
Date: Sat, 14 Jan 2017 09:11:07 -0800
Subject: [PATCH] pool: rename ignoreDiscovery.

---
 etc/sample.conf      | 2 +-
 lib/net/pool.js      | 4 ++--
 lib/node/config.js   | 2 +-
 lib/node/fullnode.js | 2 +-
 lib/node/spvnode.js  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/sample.conf b/etc/sample.conf
index 98537436..2d8293f6 100644
--- a/etc/sample.conf
+++ b/etc/sample.conf
@@ -40,7 +40,7 @@ compact: true
 bip151: true
 # proxy-server: localhost
 # preferred-seed: seed.bitcoin.sipa.be
-# ignore-discovery: false
+# no-discovery: false
 # port: 8333
 listen: true
 max-outbound: 8
diff --git a/lib/net/pool.js b/lib/net/pool.js
index 423272f8..89317711 100644
--- a/lib/net/pool.js
+++ b/lib/net/pool.js
@@ -58,7 +58,7 @@ var VerifyResult = errors.VerifyResult;
  * transactions accepted to our mempool.
  * @param {Boolean?} options.witness - Request witness blocks and transactions.
  * Only deal with witness peers.
- * @param {Boolean} options.ignoreDiscovery - Automatically discover new
+ * @param {Boolean} options.noDiscovery - Automatically discover new
  * peers.
  * @param {String[]} options.seeds
  * @param {Function?} options.createSocket - Custom function to create a socket.
@@ -1009,7 +1009,7 @@ Pool.prototype.handleVersion = function handleVersion(peer, packet) {
 Pool.prototype.handleAddr = function handleAddr(peer, addrs) {
   var i, addr;
 
-  if (this.options.ignoreDiscovery)
+  if (this.options.noDiscovery)
     return;
 
   for (i = 0; i < addrs.length; i++) {
diff --git a/lib/node/config.js b/lib/node/config.js
index ab9dee55..03331e4a 100644
--- a/lib/node/config.js
+++ b/lib/node/config.js
@@ -195,7 +195,7 @@ config.parseData = function parseData(data, prefix, dirname) {
   options.preferredSeed = str(data.preferredseed);
   options.maxOutbound = num(data.maxoutbound);
   options.maxInbound = num(data.maxinbound);
-  options.ignoreDiscovery = bool(data.ignorediscovery);
+  options.noDiscovery = bool(data.nodiscovery);
   options.port = num(data.port);
   options.listen = bool(data.listen);
   options.knownPeers = file(data.knownpeers, prefix, dirname, 'utf8');
diff --git a/lib/node/fullnode.js b/lib/node/fullnode.js
index 66531097..67a4649c 100644
--- a/lib/node/fullnode.js
+++ b/lib/node/fullnode.js
@@ -117,7 +117,7 @@ function FullNode(options) {
     maxInbound: this.options.maxInbound,
     proxyServer: this.options.proxyServer,
     preferredSeed: this.options.preferredSeed,
-    ignoreDiscovery: this.options.ignoreDiscovery,
+    noDiscovery: this.options.noDiscovery,
     port: this.options.port,
     listen: this.options.listen,
     spv: false
diff --git a/lib/node/spvnode.js b/lib/node/spvnode.js
index 5adea5ec..3a09a31a 100644
--- a/lib/node/spvnode.js
+++ b/lib/node/spvnode.js
@@ -71,7 +71,7 @@ function SPVNode(options) {
     knownPeers: this.options.knownPeers,
     identityKey: this.options.identityKey,
     maxOutbound: this.options.maxOutbound,
-    ignoreDiscovery: this.options.ignoreDiscovery,
+    noDiscovery: this.options.noDiscovery,
     headers: this.options.headers,
     selfish: true,
     listen: false,