From 7ce91b1a4303f5a374e1abfe8bae933e36b282ef Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Wed, 18 Jul 2018 14:22:40 +0800 Subject: [PATCH] Minor tweaks --- electrumx/server/controller.py | 3 +-- electrumx/server/session.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/electrumx/server/controller.py b/electrumx/server/controller.py index aa26b0c..43346df 100644 --- a/electrumx/server/controller.py +++ b/electrumx/server/controller.py @@ -6,6 +6,7 @@ # and warranty status of this software. from aiorpcx import _version as aiorpcx_version + import electrumx from electrumx.lib.server_base import ServerBase from electrumx.lib.tasks import Tasks @@ -38,8 +39,6 @@ class Controller(ServerBase): self.logger.info(f'supported protocol versions: {min_str}-{max_str}') self.logger.info(f'event loop policy: {env.loop_policy}') - env.max_send = max(350000, env.max_send) - self.tasks = Tasks() self.chain_state = ChainState(env, self.tasks, self.shutdown_event) self.peer_mgr = PeerManager(env, self.tasks, self.chain_state) diff --git a/electrumx/server/session.py b/electrumx/server/session.py index cb34d5b..9bcea6d 100644 --- a/electrumx/server/session.py +++ b/electrumx/server/session.py @@ -98,6 +98,7 @@ class SessionManager(object): CATCHING_UP, LISTENING, PAUSED, SHUTTING_DOWN = range(4) def __init__(self, env, tasks, chain_state, peer_mgr): + env.max_send = max(350000, env.max_send) self.env = env self.tasks = tasks self.chain_state = chain_state @@ -713,8 +714,7 @@ class ElectrumX(SessionBase): async def add_peer(self, features): '''Add a peer (but only if the peer resolves to the source).''' - peer_mgr = self.peer_mgr - return await peer_mgr.on_add_peer(features, self.peer_address()) + return await self.peer_mgr.on_add_peer(features, self.peer_address()) def peers_subscribe(self): '''Return the server peers as a list of (ip, host, details) tuples.'''