From 82dc59706e3cf0184083ddc10a25674608235f48 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Tue, 11 Apr 2017 16:42:12 -0400 Subject: [PATCH] [tests] don't build blocks manually in getblocktemplate test --- test/functional/getblocktemplate_proposals.py | 149 +++++++----------- 1 file changed, 57 insertions(+), 92 deletions(-) diff --git a/test/functional/getblocktemplate_proposals.py b/test/functional/getblocktemplate_proposals.py index 788e3ce259..a65d14ce06 100755 --- a/test/functional/getblocktemplate_proposals.py +++ b/test/functional/getblocktemplate_proposals.py @@ -4,66 +4,21 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test block proposals with getblocktemplate.""" -from binascii import a2b_hex, b2a_hex -from hashlib import sha256 -from struct import pack +from binascii import b2a_hex +import copy from test_framework.blocktools import create_coinbase from test_framework.test_framework import BitcoinTestFramework +from test_framework.mininode import CBlock from test_framework.util import * def b2x(b): return b2a_hex(b).decode('ascii') -# NOTE: This does not work for signed numbers (set the high bit) or zero (use b'\0') -def encodeUNum(n): - s = bytearray(b'\1') - while n > 127: - s[0] += 1 - s.append(n % 256) - n //= 256 - s.append(n) - return bytes(s) - -def varlenEncode(n): - if n < 0xfd: - return pack(' 1: - n = [] - if len(cur) & 1: - cur.append(cur[-1]) - for i in range(0, len(cur), 2): - n.append(dblsha(cur[i] + cur[i + 1])) - cur = n - return cur[0] - -def template_to_bytearray(tmpl, txlist): - blkver = pack('