diff options
author | MarcoFalke <falke.marco@gmail.com> | 2016-04-10 16:54:28 +0200 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2016-04-15 09:55:12 +0200 |
commit | f1f1b82033271e1f8aa3d84f8e4f8ccc987e6553 (patch) | |
tree | ea8a2d220e76c9765c7b6a9917cffbf9a13db660 /qa/rpc-tests/test_framework/util.py | |
parent | c0d9e31611c57ba5ebabc33dbe9bf7edbfff561e (diff) | |
download | bitcoin-f1f1b82033271e1f8aa3d84f8e4f8ccc987e6553.tar.xz |
[qa] py2: Unfiddle strings into bytes explicitly
Github-Pull: #7853
Rebased-From: faa41ee204124da19dcf1e5b8a3aef1e216bf5e6, fa7abe0a00464e6aa88d55c63dba40878bbe5b79
Conflicts:
qa/rpc-tests/invalidtxrequest.py
qa/rpc-tests/p2p-feefilter.py
qa/rpc-tests/proxy_test.py
qa/rpc-tests/test_framework/mininode.py
qa/rpc-tests/test_framework/netutil.py
src/test/bctest.py
Diffstat (limited to 'qa/rpc-tests/test_framework/util.py')
-rw-r--r-- | qa/rpc-tests/test_framework/util.py | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py index 5b9ce890ba..eb29fea312 100644 --- a/qa/rpc-tests/test_framework/util.py +++ b/qa/rpc-tests/test_framework/util.py @@ -1,6 +1,8 @@ # Copyright (c) 2014-2015 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. + + # # Helpful routines for regression testing # @@ -9,6 +11,8 @@ import os import sys +from binascii import hexlify, unhexlify +from base64 import b64encode from decimal import Decimal, ROUND_DOWN import json import random @@ -70,6 +74,15 @@ def check_json_precision(): def count_bytes(hex_string): return len(bytearray.fromhex(hex_string)) +def bytes_to_hex_str(byte_str): + return hexlify(byte_str).decode('ascii') + +def hex_str_to_bytes(hex_str): + return unhexlify(hex_str.encode('ascii')) + +def str_to_b64str(string): + return b64encode(string.encode('utf-8')).decode('ascii') + def sync_blocks(rpc_connections, wait=1): """ Wait until everybody has the same block count @@ -425,7 +438,7 @@ def assert_is_hash_string(string, length=64): "String %r contains invalid characters for a hash." % string) def satoshi_round(amount): - return Decimal(amount).quantize(Decimal('0.00000001'), rounding=ROUND_DOWN) + return Decimal(amount).quantize(Decimal('0.00000001'), rounding=ROUND_DOWN) # Helper to create at least "count" utxos # Pass in a fee that is sufficient for relay and mining new transactions. |