From 8970205e6cbd7c30313cb6b8537fc74460ee7faa Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Wed, 23 Nov 2016 09:16:41 +0900
Subject: [PATCH] Remove obsolete debugging feature

---
 server/block_processor.py |  3 +--
 server/daemon.py          | 14 ++------------
 server/env.py             |  2 --
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/server/block_processor.py b/server/block_processor.py
index 8affd8f..05bba45 100644
--- a/server/block_processor.py
+++ b/server/block_processor.py
@@ -142,8 +142,7 @@ class BlockProcessor(server.db.DB):
         self.tip = self.db_tip
         self.tx_count = self.db_tx_count
 
-        self.daemon = Daemon(self.coin.daemon_urls(env.daemon_url), env.debug)
-        self.daemon.debug_set_height(self.height)
+        self.daemon = Daemon(self.coin.daemon_urls(env.daemon_url))
         self.caught_up = False
         self.touched = set()
         self.futures = []
diff --git a/server/daemon.py b/server/daemon.py
index c1ab980..40d9816 100644
--- a/server/daemon.py
+++ b/server/daemon.py
@@ -27,7 +27,7 @@ class Daemon(util.LoggedClass):
     class DaemonWarmingUpError(Exception):
         '''Raised when the daemon returns an error in its results.'''
 
-    def __init__(self, urls, debug):
+    def __init__(self, urls):
         super().__init__()
         if not urls:
             raise DaemonError('no daemon URLs provided')
@@ -36,17 +36,10 @@ class Daemon(util.LoggedClass):
         self.urls = urls
         self.url_index = 0
         self._height = None
-        self.debug_caught_up = 'caught_up' in debug
         # Limit concurrent RPC calls to this number.
         # See DEFAULT_HTTP_WORKQUEUE in bitcoind, which is typically 16
         self.workqueue_semaphore = asyncio.Semaphore(value=10)
 
-    def debug_set_height(self, height):
-        if self.debug_caught_up:
-            self.logger.info('pretending to have caught up to height {}'
-                             .format(height))
-            self._height = height
-
     async def _send(self, payload, processor):
         '''Send a payload to be converted to JSON.
 
@@ -157,8 +150,6 @@ class Daemon(util.LoggedClass):
 
     async def mempool_hashes(self):
         '''Return the hashes of the txs in the daemon's mempool.'''
-        if self.debug_caught_up:
-            return []
         return await self._send_single('getrawmempool')
 
     async def estimatefee(self, params):
@@ -191,8 +182,7 @@ class Daemon(util.LoggedClass):
 
     async def height(self):
         '''Query the daemon for its current height.'''
-        if not self.debug_caught_up:
-            self._height = await self._send_single('getblockcount')
+        self._height = await self._send_single('getblockcount')
         return self._height
 
     def cached_height(self):
diff --git a/server/env.py b/server/env.py
index beb1bc2..195437b 100644
--- a/server/env.py
+++ b/server/env.py
@@ -44,8 +44,6 @@ class Env(LoggedClass):
         # The electrum client takes the empty string as unspecified
         self.donation_address = self.default('DONATION_ADDRESS', '')
         self.db_engine = self.default('DB_ENGINE', 'leveldb')
-        self.debug = self.default('DEBUG', '')
-        self.debug = [item.lower() for item in self.debug.split()]
         # Subscription limits
         self.max_subs = self.integer('MAX_SUBS', 250000)
         self.max_session_subs = self.integer('MAX_SESSION_SUBS', 50000)