RanchiMall/electrumx
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Require aiohttp >= 2.0

Browse Source
This commit is contained in:
Neil Booth 2018-07-21 18:43:05 +08:00
parent 74c5c3f817
commit 6cf7b049fa
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/HOWTO.rst
View File

@ -18,11 +18,10 @@ Package Notes
Python3 ElectrumX uses asyncio. Python version >= 3.6 is Python3 ElectrumX uses asyncio. Python version >= 3.6 is
**required**. **required**.
`aiohttp`_ Python library for asynchronous HTTP. Version >= `aiohttp`_ Python library for asynchronous HTTP. Version >=
1.0 required; I am using 3.0.1. 2.0 required.
`pylru`_ Python LRU cache package. I'm using 1.0.9. `pylru`_ Python LRU cache package.
DB Engine I use `plyvel`_ 0.9, a Python interface to LevelDB. DB Engine A database engine package is required; two are
A database engine package is required but others supported (see `Database Engine`_ below).
are supported (see **Database Engine** below).
================ ======================== ================ ========================
Some coins need an additional package, typically for their block hash Some coins need an additional package, typically for their block hash

1
docs/changelog.rst
View File

@ -14,6 +14,7 @@ Version 1.6.1 (in progress)
============================ ============================
* cleaner shutdown process with clear guarantees * cleaner shutdown process with clear guarantees
* aiohttp min version requirement raised to 2.0
* onion peers are ignored if no tor proxy is available * onion peers are ignored if no tor proxy is available
* add Motion coin (ocruzv) * add Motion coin (ocruzv)

11
electrumx/server/daemon.py
View File

@ -48,13 +48,6 @@ class Daemon(object):
self.down = False self.down = False
self.last_error_time = 0 self.last_error_time = 0
self.req_id = 0 self.req_id = 0
# assignment of asyncio.TimeoutError are essentially ignored
if aiohttp.__version__.startswith('1.'):
self.ClientHttpProcessingError = aiohttp.ClientHttpProcessingError
self.ClientPayloadError = asyncio.TimeoutError
else:
self.ClientHttpProcessingError = asyncio.TimeoutError
self.ClientPayloadError = aiohttp.ClientPayloadError
self._available_rpcs = {} # caches results for _is_rpc_available() self._available_rpcs = {} # caches results for _is_rpc_available()
def next_req_id(self): def next_req_id(self):
@ -140,9 +133,7 @@ class Daemon(object):
log_error('timeout error.') log_error('timeout error.')
except aiohttp.ServerDisconnectedError: except aiohttp.ServerDisconnectedError:
log_error('disconnected.') log_error('disconnected.')
except self.ClientHttpProcessingError: except aiohttp.ClientPayloadError:
log_error('HTTP error.')
except self.ClientPayloadError:
log_error('payload encoding error.') log_error('payload encoding error.')
except aiohttp.ClientConnectionError: except aiohttp.ClientConnectionError:
log_error('connection problem - is your daemon running?') log_error('connection problem - is your daemon running?')

2
setup.py
View File

@ -11,7 +11,7 @@ setuptools.setup(
# "tribus_hash" package is required to sync Denarius network. # "tribus_hash" package is required to sync Denarius network.
# "blake256" package is required to sync Decred network. # "blake256" package is required to sync Decred network.
# "xevan_hash" package is required to sync Xuez network. # "xevan_hash" package is required to sync Xuez network.
install_requires=['aiorpcX >= 0.5.6', 'plyvel', 'pylru', 'aiohttp >= 1'], install_requires=['aiorpcX >= 2.0', 'plyvel', 'pylru', 'aiohttp >= 1'],
packages=setuptools.find_packages(include=('electrumx*',)), packages=setuptools.find_packages(include=('electrumx*',)),
description='ElectrumX Server', description='ElectrumX Server',
author='Neil Booth', author='Neil Booth',