AaronFiore/electrum
1
0
Fork 0
Code Activity

interface: further clean-up in 'step'

Browse Source
This commit is contained in:
SomberNight
2018-09-15 07:26:36 +02:00
parent beb37aafc5
commit 482259df8b
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
electrum/interface.py
View File

@@ -40,6 +40,7 @@ from . import x509
from . import pem from . import pem
from .version import ELECTRUM_VERSION, PROTOCOL_VERSION from .version import ELECTRUM_VERSION, PROTOCOL_VERSION
from . import blockchain from . import blockchain
from .blockchain import Blockchain
from . import constants from . import constants
@@ -400,6 +401,7 @@ class Interface(PrintError):
async def step(self, height, header=None): async def step(self, height, header=None):
assert height != 0 assert height != 0
assert height <= self.tip, (height, self.tip)
if header is None: if header is None:
header = await self.get_block_header(height, 'catchup') header = await self.get_block_header(height, 'catchup')
chain = self.blockchain.check_header(header) if 'mock' not in header else header['mock']['check'](header) chain = self.blockchain.check_header(header) if 'mock' not in header else header['mock']['check'](header)
@@ -415,18 +417,14 @@ 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
if type(can_connect) is bool: assert height <= self.tip, (height, self.tip)
# mock if isinstance(can_connect, Blockchain): # not when mocking
assert height <= self.tip self.blockchain = can_connect
return 'catchup', height self.blockchain.save_header(header)
self.blockchain = can_connect
self.blockchain.save_header(header)
return 'catchup', height return 'catchup', height
# binary # binary
if type(chain) in [int, bool]: if isinstance(chain, Blockchain): # not when mocking
pass # mock
else:
self.blockchain = chain self.blockchain = chain
good = height good = height
height = (bad + good) // 2 height = (bad + good) // 2
@@ -435,13 +433,12 @@ class Interface(PrintError):
self.print_error("binary step") self.print_error("binary step")
chain = blockchain.check_header(header) if 'mock' not in header else header['mock']['check'](header) chain = blockchain.check_header(header) if 'mock' not in header else header['mock']['check'](header)
if chain: if chain:
assert bad != height, (bad, height)
good = height good = height
self.blockchain = self.blockchain if type(chain) in [bool, int] else chain self.blockchain = self.blockchain if type(chain) in [bool, int] else chain
else: else:
bad = height bad = height
assert good != height
bad_header = header bad_header = header
assert good < bad, (good, bad)
if bad != good + 1: if bad != good + 1:
height = (bad + good) // 2 height = (bad + good) // 2
header = await self.get_block_header(height, 'binary') header = await self.get_block_header(height, 'binary')
@@ -452,9 +449,7 @@ class Interface(PrintError):
raise Exception('unexpected bad header during binary' + str(bad_header)) # line 948 in 8e69174374aee87d73cd2f8005fbbe87c93eee9c's network.py raise Exception('unexpected bad header during binary' + str(bad_header)) # line 948 in 8e69174374aee87d73cd2f8005fbbe87c93eee9c's network.py
branch = blockchain.blockchains.get(bad) branch = blockchain.blockchains.get(bad)
if branch is not None: if branch is not None:
ismocking = False ismocking = type(branch) is dict
if type(branch) is dict:
ismocking = True
# FIXME: it does not seem sufficient to check that the branch # FIXME: it does not seem sufficient to check that the branch
# contains the bad_header. what if self.blockchain doesn't? # contains the bad_header. what if self.blockchain doesn't?
# the chains shouldn't be joined then. observe the incorrect # the chains shouldn't be joined then. observe the incorrect
@@ -521,12 +516,11 @@ class Interface(PrintError):
if chain or can_connect: if chain or can_connect:
return False return False
if checkp: if checkp:
raise Exception("server chain conflicts with checkpoints. {} {}".format(can_connect, chain)) raise Exception("server chain conflicts with checkpoints")
return True return True
bad, bad_header = height, header bad, bad_header = height, header
height -= 1 height -= 1
header = None
while await iterate(): while await iterate():
bad, bad_header = height, header bad, bad_header = height, header
delta = self.tip - height delta = self.tip - height