Browse Source

Require aiorpcX 0.13.2

patch-2
Neil Booth 6 years ago
parent
commit
a8e1dff79d
  1. 4
      electrumx/server/controller.py
  2. 6
      electrumx/server/session.py
  3. 2
      setup.py

4
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()

6
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),

2
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',

Loading…
Cancel
Save