Merge #11772: [tests] Change invalidblockrequest to use BitcoinTestFramework
e97b113b04
[tests] Change invalidblockrequest to use BitcoinTestFramework (John Newbery)2b7064eda7
[tests] Fix flake8 warnings in invalidblockrequest (John Newbery)54b8c580b7
[test] Fix nits leftover from 11771 (Conor Scott) Pull request description: Builds on #11771. Please review that PR first Next step in #10603. - first commit tidies up invalidblockrequest.py - second commit removes usage of ComparisonTestFramework Tree-SHA512: 14b10c09c8c0ebef4a9176eb5b883a275d04c096785ee31b84ef594eed346ec6344d7ed32184c5fb397e744725df3911f45cdfadd0810e5a52eaa256084e3456
This commit is contained in:
commit
0630974647
2 changed files with 51 additions and 66 deletions
|
@ -10,75 +10,63 @@ In this test we connect to one node over p2p, and test block requests:
|
|||
3) Invalid block with bad coinbase value should be rejected and not
|
||||
re-requested.
|
||||
"""
|
||||
|
||||
from test_framework.test_framework import ComparisonTestFramework
|
||||
from test_framework.util import *
|
||||
from test_framework.comptool import TestManager, TestInstance, RejectResult
|
||||
from test_framework.blocktools import *
|
||||
from test_framework.mininode import network_thread_start
|
||||
import copy
|
||||
import time
|
||||
|
||||
# Use the ComparisonTestFramework with 1 node: only use --testbinary.
|
||||
class InvalidBlockRequestTest(ComparisonTestFramework):
|
||||
from test_framework.blocktools import create_block, create_coinbase, create_transaction
|
||||
from test_framework.messages import COIN
|
||||
from test_framework.mininode import network_thread_start, P2PDataStore
|
||||
from test_framework.test_framework import BitcoinTestFramework
|
||||
from test_framework.util import assert_equal
|
||||
|
||||
''' Can either run this test as 1 node with expected answers, or two and compare them.
|
||||
Change the "outcome" variable from each TestInstance object to only do the comparison. '''
|
||||
class InvalidBlockRequestTest(BitcoinTestFramework):
|
||||
def set_test_params(self):
|
||||
self.num_nodes = 1
|
||||
self.setup_clean_chain = True
|
||||
self.extra_args = [["-whitelist=127.0.0.1"]]
|
||||
|
||||
def run_test(self):
|
||||
test = TestManager(self, self.options.tmpdir)
|
||||
test.add_all_connections(self.nodes)
|
||||
self.tip = None
|
||||
self.block_time = None
|
||||
# Add p2p connection to node0
|
||||
node = self.nodes[0] # convenience reference to the node
|
||||
node.add_p2p_connection(P2PDataStore())
|
||||
|
||||
network_thread_start()
|
||||
test.run()
|
||||
node.p2p.wait_for_verack()
|
||||
|
||||
def get_tests(self):
|
||||
if self.tip is None:
|
||||
self.tip = int("0x" + self.nodes[0].getbestblockhash(), 0)
|
||||
self.block_time = int(time.time())+1
|
||||
best_block = node.getblock(node.getbestblockhash())
|
||||
tip = int(node.getbestblockhash(), 16)
|
||||
height = best_block["height"] + 1
|
||||
block_time = best_block["time"] + 1
|
||||
|
||||
self.log.info("Create a new block with an anyone-can-spend coinbase")
|
||||
|
||||
'''
|
||||
Create a new block with an anyone-can-spend coinbase
|
||||
'''
|
||||
height = 1
|
||||
block = create_block(self.tip, create_coinbase(height), self.block_time)
|
||||
self.block_time += 1
|
||||
block = create_block(tip, create_coinbase(height), block_time)
|
||||
block.solve()
|
||||
# Save the coinbase for later
|
||||
self.block1 = block
|
||||
self.tip = block.sha256
|
||||
height += 1
|
||||
yield TestInstance([[block, True]])
|
||||
block1 = block
|
||||
tip = block.sha256
|
||||
node.p2p.send_blocks_and_test([block1], node, True)
|
||||
|
||||
'''
|
||||
Now we need that block to mature so we can spend the coinbase.
|
||||
'''
|
||||
test = TestInstance(sync_every_block=False)
|
||||
for i in range(100):
|
||||
block = create_block(self.tip, create_coinbase(height), self.block_time)
|
||||
block.solve()
|
||||
self.tip = block.sha256
|
||||
self.block_time += 1
|
||||
test.blocks_and_transactions.append([block, True])
|
||||
height += 1
|
||||
yield test
|
||||
self.log.info("Mature the block.")
|
||||
node.generate(100)
|
||||
|
||||
'''
|
||||
Now we use merkle-root malleability to generate an invalid block with
|
||||
same blockheader.
|
||||
Manufacture a block with 3 transactions (coinbase, spend of prior
|
||||
coinbase, spend of that spend). Duplicate the 3rd transaction to
|
||||
leave merkle root and blockheader unchanged but invalidate the block.
|
||||
'''
|
||||
block2 = create_block(self.tip, create_coinbase(height), self.block_time)
|
||||
self.block_time += 1
|
||||
best_block = node.getblock(node.getbestblockhash())
|
||||
tip = int(node.getbestblockhash(), 16)
|
||||
height = best_block["height"] + 1
|
||||
block_time = best_block["time"] + 1
|
||||
|
||||
# Use merkle-root malleability to generate an invalid block with
|
||||
# same blockheader.
|
||||
# Manufacture a block with 3 transactions (coinbase, spend of prior
|
||||
# coinbase, spend of that spend). Duplicate the 3rd transaction to
|
||||
# leave merkle root and blockheader unchanged but invalidate the block.
|
||||
self.log.info("Test merkle root malleability.")
|
||||
|
||||
block2 = create_block(tip, create_coinbase(height), block_time)
|
||||
block_time += 1
|
||||
|
||||
# b'0x51' is OP_TRUE
|
||||
tx1 = create_transaction(self.block1.vtx[0], 0, b'\x51', 50 * COIN)
|
||||
tx1 = create_transaction(block1.vtx[0], 0, b'\x51', 50 * COIN)
|
||||
tx2 = create_transaction(tx1, 0, b'\x51', 50 * COIN)
|
||||
|
||||
block2.vtx.extend([tx1, tx2])
|
||||
|
@ -94,24 +82,20 @@ class InvalidBlockRequestTest(ComparisonTestFramework):
|
|||
assert_equal(orig_hash, block2.rehash())
|
||||
assert(block2_orig.vtx != block2.vtx)
|
||||
|
||||
self.tip = block2.sha256
|
||||
yield TestInstance([[block2, RejectResult(16, b'bad-txns-duplicate')], [block2_orig, True]])
|
||||
height += 1
|
||||
node.p2p.send_blocks_and_test([block2], node, False, False, 16, b'bad-txns-duplicate')
|
||||
|
||||
'''
|
||||
Make sure that a totally screwed up block is not valid.
|
||||
'''
|
||||
block3 = create_block(self.tip, create_coinbase(height), self.block_time)
|
||||
self.block_time += 1
|
||||
block3.vtx[0].vout[0].nValue = 100 * COIN # Too high!
|
||||
block3.vtx[0].sha256=None
|
||||
self.log.info("Test very broken block.")
|
||||
|
||||
block3 = create_block(tip, create_coinbase(height), block_time)
|
||||
block_time += 1
|
||||
block3.vtx[0].vout[0].nValue = 100 * COIN # Too high!
|
||||
block3.vtx[0].sha256 = None
|
||||
block3.vtx[0].calc_sha256()
|
||||
block3.hashMerkleRoot = block3.calc_merkle_root()
|
||||
block3.rehash()
|
||||
block3.solve()
|
||||
|
||||
yield TestInstance([[block3, RejectResult(16, b'bad-cb-amount')]])
|
||||
|
||||
node.p2p.send_blocks_and_test([block3], node, False, False, 16, b'bad-cb-amount')
|
||||
|
||||
if __name__ == '__main__':
|
||||
InvalidBlockRequestTest().main()
|
||||
|
|
|
@ -33,12 +33,10 @@ class InvalidTxRequestTest(BitcoinTestFramework):
|
|||
self.log.info("Create a new block with an anyone-can-spend coinbase.")
|
||||
height = 1
|
||||
block = create_block(tip, create_coinbase(height), block_time)
|
||||
block_time += 1
|
||||
block.solve()
|
||||
# Save the coinbase for later
|
||||
block1 = block
|
||||
tip = block.sha256
|
||||
height += 1
|
||||
node.p2p.send_blocks_and_test([block], node, success=True)
|
||||
|
||||
self.log.info("Mature the block.")
|
||||
|
@ -49,7 +47,10 @@ class InvalidTxRequestTest(BitcoinTestFramework):
|
|||
tx1 = create_transaction(block1.vtx[0], 0, b'\x64', 50 * COIN - 12000)
|
||||
node.p2p.send_txs_and_test([tx1], node, success=False, reject_code=16, reject_reason=b'mandatory-script-verify-flag-failed (Invalid OP_IF construction)')
|
||||
|
||||
# TODO: test further transactions...
|
||||
# Verify valid transaction
|
||||
tx1 = create_transaction(block1.vtx[0], 0, b'', 50 * COIN - 12000)
|
||||
node.p2p.send_txs_and_test([tx1], node, success=True)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
InvalidTxRequestTest().main()
|
||||
|
|
Loading…
Reference in a new issue