From a8e1dff79d2a48aa1d2a7e043f38d9c6369779da Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Fri, 12 Apr 2019 16:13:07 +0100 Subject: [PATCH] Require aiorpcX 0.13.2 --- electrumx/server/controller.py | 4 ++-- electrumx/server/session.py | 6 +++--- setup.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/electrumx/server/controller.py b/electrumx/server/controller.py index 5f3177f..01ab6c4 100644 --- a/electrumx/server/controller.py +++ b/electrumx/server/controller.py @@ -82,8 +82,8 @@ class Controller(ServerBase): '''Start the RPC server and wait for the mempool to synchronize. Then start serving external clients. ''' - if not (0, 13, 1) <= aiorpcx_version < (0, 14): - raise RuntimeError('aiorpcX version 0.13.x, x>=1, is required') + if not (0, 13, 2) <= aiorpcx_version < (0, 14): + raise RuntimeError('aiorpcX version 0.13.x, x>=2, is required') env = self.env min_str, max_str = env.coin.SESSIONCLS.protocol_min_max_strings() diff --git a/electrumx/server/session.py b/electrumx/server/session.py index 46b76f9..28af98f 100644 --- a/electrumx/server/session.py +++ b/electrumx/server/session.py @@ -279,7 +279,7 @@ class SessionManager(object): 'paused': sum(not s._can_send.is_set() for s in self.sessions), 'pid': os.getpid(), 'peers': self.peer_mgr.info(), - 'requests': sum(s.processing_count for s in self.sessions), + 'requests': sum(s.unanswered_request_count() for s in self.sessions), 'sessions': self.session_count(), 'sessions_with_subs': self.session_count_with_subs(), 'subs': self._sub_count(), @@ -299,7 +299,7 @@ class SessionManager(object): session.protocol_version_string(), session.cost, session.extra_cost(), - session.processing_count, + session.unanswered_request_count(), session.txs_sent, session.sub_count(), session.recv_count, session.recv_size, @@ -316,7 +316,7 @@ class SessionManager(object): len(sessions), sum(s.cost for s in sessions), group.retained_cost, - sum(s.processing_count for s in sessions), + sum(s.unanswered_request_count() for s in sessions), sum(s.txs_sent for s in sessions), sum(s.sub_count() for s in sessions), sum(s.recv_count for s in sessions), diff --git a/setup.py b/setup.py index d6239fb..8a3ee01 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ setuptools.setup( # "xevan_hash" package is required to sync Xuez network. # "groestlcoin_hash" package is required to sync Groestlcoin network. # "pycryptodomex" package is required to sync SmartCash network. - install_requires=['aiorpcX>=0.13.1,<0.14', 'attrs', + install_requires=['aiorpcX>=0.13.2,<0.14', 'attrs', 'plyvel', 'pylru', 'aiohttp >= 2'], packages=setuptools.find_packages(include=('electrumx*',)), description='ElectrumX Server',