MERGE-FIX: mining_basic.py: Remove magic constants, make sure serialized header deserializes

instagibbs · instagibbs · commit 60b7ef5287b1 · 2019-01-23T16:48:36.000-05:00
diff --git a/test/functional/mining_basic.py b/test/functional/mining_basic.py
@@ -108,7 +108,7 @@ def run_test(self):
 
         self.log.info("getblocktemplate: Test bad tx count")
         # The tx count is immediately after the block header
-        TX_COUNT_OFFSET = 80+4 # height is extra 4
+        TX_COUNT_OFFSET = len(CBlockHeader().serialize())
         bad_block_sn = bytearray(block.serialize())
         assert_equal(bad_block_sn[TX_COUNT_OFFSET], 1)
         bad_block_sn[TX_COUNT_OFFSET] += 1
@@ -138,9 +138,11 @@ def run_test(self):
         assert_template(node, bad_block, 'inconclusive-not-best-prevblk')
 
         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' * TX_COUNT_OFFSET))
+        assert_raises_rpc_error(-22, 'Block header decode failed', lambda: node.submitheader(hexdata='ff' * (TX_COUNT_OFFSET-2)))
+        import pdb
+        pdb.set_trace()
+        assert_raises_rpc_error(-25, 'Must submit previous header', lambda: node.submitheader(hexdata=super(CBlock, bad_block).serialize().hex()))
 
         block.solve()
 
