aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-22 08:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests/test_lightningd.py: make test_blockchaintrack safe to re-run.

Browse Source 
It gets confused if re-run due to flaky, since:
1. Using the same HSM, it generates the same spend and sees a previous one.
2. The block height numbers are off.

Fixes: #1479
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-05-09 14:00:35 +09:30
parent ecebbe700b
commit 2caeab506b
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_lightningd.py
View File

@@ -4512,7 +4512,7 @@ class LightningDTests(BaseLightningDTests):
def test_blockchaintrack(self): def test_blockchaintrack(self):
"""Check that we track the blockchain correctly across reorgs """Check that we track the blockchain correctly across reorgs
""" """
l1 = self.node_factory.get_node() l1 = self.node_factory.get_node(random_hsm=True)
addr = l1.rpc.newaddr()['address'] addr = l1.rpc.newaddr()['address']
###################################################################### ######################################################################
@@ -4520,6 +4520,8 @@ class LightningDTests(BaseLightningDTests):
# and we try to add a block twice when rescanning: # and we try to add a block twice when rescanning:
l1.restart() l1.restart()
height = bitcoind.rpc.getblockcount()
# At height 111 we receive an incoming payment # At height 111 we receive an incoming payment
hashes = bitcoind.rpc.generate(9) hashes = bitcoind.rpc.generate(9)
bitcoind.rpc.sendtoaddress(addr, 1) bitcoind.rpc.sendtoaddress(addr, 1)
@@ -4533,17 +4535,17 @@ class LightningDTests(BaseLightningDTests):
###################################################################### ######################################################################
# Second failure scenario: perform a 20 block reorg # Second failure scenario: perform a 20 block reorg
bitcoind.rpc.generate(10) bitcoind.rpc.generate(10)
bitcoind.rpc.getblockcount() l1.daemon.wait_for_log('Adding block {}: '.format(height + 20))
l1.daemon.wait_for_log(r'Adding block 121: [a-f0-9]{32}')
# Now reorg out with a longer fork of 21 blocks # Now reorg out with a longer fork of 21 blocks
bitcoind.rpc.invalidateblock(hashes[0]) bitcoind.rpc.invalidateblock(hashes[0])
bitcoind.wait_for_log(r'InvalidChainFound: invalid block=.* height=102') bitcoind.wait_for_log(r'InvalidChainFound: invalid block=.* height={}'
.format(height + 1))
hashes = bitcoind.rpc.generate(30) hashes = bitcoind.rpc.generate(30)
time.sleep(1) time.sleep(1)
bitcoind.rpc.getblockcount() bitcoind.rpc.getblockcount()
l1.daemon.wait_for_log(r'Adding block 131: [a-f0-9]{32}') l1.daemon.wait_for_log('Adding block {}: '.format(height + 30))
# Our funds got reorged out, we should not have any funds that are confirmed # Our funds got reorged out, we should not have any funds that are confirmed
assert [o for o in l1.rpc.listfunds()['outputs'] if o['status'] != "unconfirmed"] == [] assert [o for o in l1.rpc.listfunds()['outputs'] if o['status'] != "unconfirmed"] == []