phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-26 19:23:26 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: Simplify create_cache

Browse source
This commit is contained in:
MarcoFalke 2019-02-23 12:56:54 -05:00
parent fa25210d62
commit fa2cdc9ac2
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
test/functional/test_framework/test_framework.py
View file

@ -277,7 +277,9 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
if not self.setup_clean_chain: if not self.setup_clean_chain:
for n in self.nodes: for n in self.nodes:
assert_equal(n.getblockchaininfo()["blocks"], 199) assert_equal(n.getblockchaininfo()["blocks"], 199)
self.log.debug('Generate a block with current time to finalize the cache and assert we are out of IBD') # To ensure that all nodes are out of IBD, the most recent block
# must have a timestamp not too old (see IsInitialBlockDownload()).
self.log.debug('Generate a block with current time')
block_hash = self.nodes[0].generate(1)[0] block_hash = self.nodes[0].generate(1)[0]
block = self.nodes[0].getblock(blockhash=block_hash, verbosity=0) block = self.nodes[0].getblock(blockhash=block_hash, verbosity=0)
for n in self.nodes: for n in self.nodes:
@ -493,14 +495,9 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
# block in the cache does not age too much (have an old tip age). # block in the cache does not age too much (have an old tip age).
# This is needed so that we are out of IBD when the test starts, # This is needed so that we are out of IBD when the test starts,
# see the tip age check in IsInitialBlockDownload(). # see the tip age check in IsInitialBlockDownload().
for i in range(2): for i in range(8):
for peer in range(4): self.nodes[0].generatetoaddress(25 if i != 7 else 24, self.nodes[i % 4].get_deterministic_priv_key().address)
for j in range(25): sync_blocks(self.nodes)
if i == 1 and peer == 3 and j == 24:
break
self.nodes[peer].generatetoaddress(1, self.nodes[peer].get_deterministic_priv_key().address)
# Must sync before next peer starts generating blocks
sync_blocks(self.nodes)
for n in self.nodes: for n in self.nodes:
assert_equal(n.getblockchaininfo()["blocks"], 199) assert_equal(n.getblockchaininfo()["blocks"], 199)