Merge c969ab43c3 into merged_master (Bitcoin PR #21084)

This commit is contained in:
Andrew Poelstra 2021-06-21 07:59:08 +00:00
commit bbfd887a43

View file

@ -90,7 +90,7 @@ class AssumeValidTest(BitcoinTestFramework):
last_height = current_height
if timeout < 0:
assert False, "blockchain too short after timeout: %d" % current_height
timeout - 0.25
timeout -= 0.25
continue
elif current_height > height:
assert False, "blockchain too long: %d" % current_height