diff options
| author | Gregory Sanders <gsanders87@gmail.com> | 2019-01-23 10:44:13 -0500 |
|---|---|---|
| committer | Gregory Sanders <gsanders87@gmail.com> | 2019-01-24 09:48:34 -0500 |
| commit | 1e7f7417457a811f1e69a118df4c6e14033ddb55 (patch) | |
| tree | ec7a74fa8417ca46c9301de550282f8c387f94bd /test/functional/mining_basic.py | |
| parent | 82cf6813a4ef1b4a5439eb6cddb1ab426f3c31a2 (diff) | |
| download | bitcoin-1e7f7417457a811f1e69a118df4c6e14033ddb55.tar.xz | |
remove some magic mining constants in functional tests
Diffstat (limited to 'test/functional/mining_basic.py')
| -rwxr-xr-x | test/functional/mining_basic.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/functional/mining_basic.py b/test/functional/mining_basic.py index 661d9f4c97..713c8beab8 100755 --- a/test/functional/mining_basic.py +++ b/test/functional/mining_basic.py @@ -15,6 +15,7 @@ from test_framework.blocktools import create_coinbase from test_framework.messages import ( CBlock, CBlockHeader, + BLOCK_HEADER_SIZE ) from test_framework.mininode import ( P2PDataStore, @@ -131,10 +132,9 @@ class MiningTest(BitcoinTestFramework): self.log.info("getblocktemplate: Test bad tx count") # The tx count is immediately after the block header - TX_COUNT_OFFSET = 80 bad_block_sn = bytearray(block.serialize()) - assert_equal(bad_block_sn[TX_COUNT_OFFSET], 1) - bad_block_sn[TX_COUNT_OFFSET] += 1 + assert_equal(bad_block_sn[BLOCK_HEADER_SIZE], 1) + bad_block_sn[BLOCK_HEADER_SIZE] += 1 assert_raises_rpc_error(-22, "Block decode failed", node.getblocktemplate, {'data': b2x(bad_block_sn), 'mode': 'proposal', 'rules': ['segwit']}) self.log.info("getblocktemplate: Test bad bits") @@ -164,9 +164,9 @@ class MiningTest(BitcoinTestFramework): assert_submitblock(bad_block, 'prev-blk-not-found', 'prev-blk-not-found') self.log.info('submitheader tests') - assert_raises_rpc_error(-22, 'Block header decode failed', lambda: node.submitheader(hexdata='xx' * 80)) - assert_raises_rpc_error(-22, 'Block header decode failed', lambda: node.submitheader(hexdata='ff' * 78)) - assert_raises_rpc_error(-25, 'Must submit previous header', lambda: node.submitheader(hexdata='ff' * 80)) + assert_raises_rpc_error(-22, 'Block header decode failed', lambda: node.submitheader(hexdata='xx' * BLOCK_HEADER_SIZE)) + assert_raises_rpc_error(-22, 'Block header decode failed', lambda: node.submitheader(hexdata='ff' * (BLOCK_HEADER_SIZE-2))) + assert_raises_rpc_error(-25, 'Must submit previous header', lambda: node.submitheader(hexdata='ff' * BLOCK_HEADER_SIZE)) block.nTime += 1 block.solve() |