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

Daemon constructor passed coin and URLs directly

Browse Source
This commit is contained in:
Neil Booth 2018-08-12 23:44:18 +09:00
parent a108817dd4
commit 13a8b62d8c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
electrumx/server/controller.py
View File

@ -92,9 +92,11 @@ class Controller(ServerBase):
self.logger.info(f'reorg limit is {env.reorg_limit:,d} blocks') self.logger.info(f'reorg limit is {env.reorg_limit:,d} blocks')
notifications = Notifications() notifications = Notifications()
daemon = env.coin.DAEMON(env) Daemon = env.coin.DAEMON
db = DB(env)
BlockProcessor = env.coin.BLOCK_PROCESSOR BlockProcessor = env.coin.BLOCK_PROCESSOR
daemon = Daemon(env.coin, env.daemon_url)
db = DB(env)
bp = BlockProcessor(env, db, daemon, notifications) bp = BlockProcessor(env, db, daemon, notifications)
# Set ourselves up to implement the MemPoolAPI # Set ourselves up to implement the MemPoolAPI

8
electrumx/server/daemon.py
View File

@ -37,14 +37,14 @@ class Daemon(object):
class DaemonWarmingUpError(Exception): class DaemonWarmingUpError(Exception):
'''Raised when the daemon returns an error in its results.''' '''Raised when the daemon returns an error in its results.'''
def __init__(self, env): def __init__(self, coin, urls, max_workqueue=10):
self.coin = coin
self.logger = class_logger(__name__, self.__class__.__name__) self.logger = class_logger(__name__, self.__class__.__name__)
self.coin = env.coin self.set_urls(coin.daemon_urls(urls))
self.set_urls(env.coin.daemon_urls(env.daemon_url))
self._height = None self._height = None
# Limit concurrent RPC calls to this number. # Limit concurrent RPC calls to this number.
# See DEFAULT_HTTP_WORKQUEUE in bitcoind, which is typically 16 # See DEFAULT_HTTP_WORKQUEUE in bitcoind, which is typically 16
self.workqueue_semaphore = asyncio.Semaphore(value=10) self.workqueue_semaphore = asyncio.Semaphore(value=max_workqueue)
self.down = False self.down = False
self.last_error_time = 0 self.last_error_time = 0
self.req_id = 0 self.req_id = 0