From 6679eea04c36464e46c7c123af74b5461eea7bc4 Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Sun, 18 Dec 2016 07:57:48 +0900
Subject: [PATCH] getinfo RPC: change height reporting

Also rename watched to subs
Closes #80
---
 server/protocol.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/protocol.py b/server/protocol.py
index 1b06a77..1908812 100644
--- a/server/protocol.py
+++ b/server/protocol.py
@@ -408,7 +408,8 @@ class ServerManager(util.LoggedClass):
     def server_summary(self):
         '''A one-line summary of server state.'''
         return {
-            'blocks': self.bp.db_height,
+            'daemon_height': self.bp.daemon.cached_height(),
+            'db_height': self.bp.db_height,
             'closing': len([s for s in self.sessions if s.is_closing()]),
             'errors': sum(s.error_count for s in self.sessions),
             'groups': len(self.groups),
@@ -416,8 +417,8 @@ class ServerManager(util.LoggedClass):
             'peers': len(self.irc.peers),
             'requests': sum(s.requests_remaining() for s in self.sessions),
             'sessions': self.session_count(),
+            'subs': self.subscription_count,
             'txs_sent': self.txs_sent,
-            'watched': self.subscription_count,
         }
 
     @staticmethod