AaronFiore/electrum
1
0
Fork 0
Code Activity

fix prev: rm incorrect assert

Browse Source
This commit is contained in:
SomberNight
2018-09-15 08:23:49 +02:00
parent 482259df8b
commit 6f5a4a5502
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
electrum/interface.py
View File

@@ -374,8 +374,7 @@ class Interface(PrintError):
# another interface amended the blockchain # another interface amended the blockchain
self.print_error("skipping header", height) self.print_error("skipping header", height)
continue continue
if self.tip < height: height = min(height, self.tip)
height = self.tip
_, height = await self.step(height, header) _, height = await self.step(height, header)
async def sync_until(self, height, next_height=None): async def sync_until(self, height, next_height=None):
@@ -417,7 +416,6 @@ class Interface(PrintError):
if can_connect: if can_connect:
self.print_error("could connect", height) self.print_error("could connect", height)
height += 1 height += 1
assert height <= self.tip, (height, self.tip)
if isinstance(can_connect, Blockchain): # not when mocking if isinstance(can_connect, Blockchain): # not when mocking
self.blockchain = can_connect self.blockchain = can_connect
self.blockchain.save_header(header) self.blockchain.save_header(header)
@@ -469,15 +467,14 @@ class Interface(PrintError):
height = bad height = bad
header = await self.get_block_header(height, 'binary') header = await self.get_block_header(height, 'binary')
else: else:
height = bad + 1
if ismocking: if ismocking:
height = bad + 1
self.print_error("TODO replace blockchain") self.print_error("TODO replace blockchain")
return 'conflict', height return 'conflict', height
self.print_error('forkpoint conflicts with existing fork', branch.path()) self.print_error('forkpoint conflicts with existing fork', branch.path())
branch.write(b'', 0) branch.write(b'', 0)
branch.save_header(bad_header) branch.save_header(bad_header)
self.blockchain = branch self.blockchain = branch
height = bad + 1
return 'conflict', height return 'conflict', height
else: else:
bh = self.blockchain.height() bh = self.blockchain.height()