AaronFiore/electrum
1
0
Fork 0
Code Activity

interface.mark_ready: handle cancellation

Browse Source
This commit is contained in:
SomberNight
2018-09-12 18:45:15 +02:00
parent 1419a5c60d
commit 2039c07a2d
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
electrum/interface.py
View File

@@ -252,17 +252,23 @@ class Interface(PrintError):
assert False assert False
def mark_ready(self): def mark_ready(self):
if self.ready.cancelled():
self.close()
raise asyncio.CancelledError()
if self.ready.done():
return
assert self.tip_header assert self.tip_header
chain = blockchain.check_header(self.tip_header) chain = blockchain.check_header(self.tip_header)
if not chain: if not chain:
self.blockchain = blockchain.blockchains[0] self.blockchain = blockchain.blockchains[0]
else: else:
self.blockchain = chain self.blockchain = chain
assert self.blockchain is not None
self.print_error("set blockchain with height", self.blockchain.height()) self.print_error("set blockchain with height", self.blockchain.height())
if not self.ready.done(): self.ready.set_result(1)
self.ready.set_result(1)
async def save_certificate(self): async def save_certificate(self):
if not os.path.exists(self.cert_path): if not os.path.exists(self.cert_path):
@@ -349,8 +355,7 @@ class Interface(PrintError):
self.tip = height self.tip = height
if self.tip < constants.net.max_checkpoint(): if self.tip < constants.net.max_checkpoint():
raise GracefulDisconnect('server tip below max checkpoint') raise GracefulDisconnect('server tip below max checkpoint')
if not self.ready.done(): self.mark_ready()
self.mark_ready()
async with self.network.bhi_lock: async with self.network.bhi_lock:
if self.blockchain.height() < header['block_height']-1: if self.blockchain.height() < header['block_height']-1:
_, height = await self.sync_until(height, None) _, height = await self.sync_until(height, None)