RanchiMall/flo-electrum
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aiorpcx: simplify open_session

Browse Source
This commit is contained in:
Janus 2018-08-31 18:06:11 +02:00 committed by SomberNight
parent f12074397f
commit 19387ff911
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
electrum/interface.py
View File

@ -81,7 +81,7 @@ class Interface(PrintError):
async def is_server_ca_signed(self, sslc):
try:
await self.open_session(sslc, do_sleep=False)
await self.open_session(sslc, exit_early=True)
except ssl.SSLError as e:
assert e.reason == 'CERTIFICATE_VERIFY_FAILED'
return False
@ -90,7 +90,7 @@ class Interface(PrintError):
@util.aiosafe
async def run(self):
if self.protocol != 's':
await self.open_session(None, execute_after_connect=self.mark_ready)
await self.open_session(None, exit_early=False)
assert False
ca_sslc = ssl.create_default_context(ssl.Purpose.SERVER_AUTH)
@ -125,7 +125,7 @@ class Interface(PrintError):
else:
sslc = ssl.create_default_context(ssl.Purpose.SERVER_AUTH, cafile=self.cert_path)
sslc.check_hostname = 0
await self.open_session(sslc, execute_after_connect=self.mark_ready)
await self.open_session(sslc, exit_early=False)
assert False
def mark_ready(self):
@ -171,22 +171,21 @@ class Interface(PrintError):
except ValueError:
return None
async def open_session(self, sslc, do_sleep=True, execute_after_connect=lambda: None):
q = asyncio.Queue()
async with NotificationSession(None, q, self.host, self.port, ssl=sslc, proxy=self.proxy) as session:
async def open_session(self, sslc, exit_early):
header_queue = asyncio.Queue()
async with NotificationSession(None, header_queue, self.host, self.port, ssl=sslc, proxy=self.proxy) as session:
ver = await session.send_request('server.version', [ELECTRUM_VERSION, PROTOCOL_VERSION])
self.print_error(ver, do_sleep, self.host)
connect_hook_executed = False
while do_sleep:
if not connect_hook_executed:
connect_hook_executed = True
res = await session.send_request('blockchain.headers.subscribe')
self.tip_header = blockchain.deserialize_header(bfh(res['hex']), res['height'])
self.tip = res['height']
execute_after_connect()
self.session = session
if exit_early:
return
self.print_error(ver, self.host)
subscription_res = await session.send_request('blockchain.headers.subscribe')
self.tip_header = blockchain.deserialize_header(bfh(subscription_res['hex']), subscription_res['height'])
self.tip = subscription_res['height']
self.mark_ready()
self.session = session
while True:
try:
new_header = await asyncio.wait_for(q.get(), 300)
new_header = await asyncio.wait_for(header_queue.get(), 300)
self.tip_header = new_header
self.tip = new_header['block_height']
except concurrent.futures.TimeoutError: