GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge cbc32d67dc into merged_master (Bitcoin PR #18249)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:07:49 +00:00
commit e6e0bcc70d
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/functional/feature_block.py
View file

@ -1284,7 +1284,7 @@ class FullBlockTest(BitcoinTestFramework):
self.save_spendable_output()
spend = self.get_spendable_output()
self.send_blocks(blocks, True, timeout=960)
self.send_blocks(blocks, True, timeout=1920)
chain1_tip = i
# now create alt chain of same length
@ -1296,14 +1296,14 @@ class FullBlockTest(BitcoinTestFramework):
# extend alt chain to trigger re-org
block = self.next_block("alt" + str(chain1_tip + 1), version=4)
self.send_blocks([block], True, timeout=960)
self.send_blocks([block], True, timeout=1920)
# ... and re-org back to the first chain
self.move_tip(chain1_tip)
block = self.next_block(chain1_tip + 1, version=4)
self.send_blocks([block], False, force_send=True)
block = self.next_block(chain1_tip + 2, version=4)
self.send_blocks([block], True, timeout=960)
self.send_blocks([block], True, timeout=1920)
self.log.info("Reject a block with an invalid block header version")
b_v1 = self.next_block('b_v1', version=1)

2
test/fuzz/test_runner.py
View file

@ -134,7 +134,7 @@ def main():
os.path.join(config["environment"]["BUILDDIR"], 'src', 'test', 'fuzz', test_list_selection[0]),
'-help=1',
],
timeout=10,
timeout=20,
check=True,
stderr=subprocess.PIPE,
universal_newlines=True,