From 021daedfa100defad553d69cd3d628aaa5bc7caf Mon Sep 17 00:00:00 2001
From: Zero-1729 <zero1729@protonmail.com>
Date: Mon, 16 Aug 2021 19:30:44 +0100
Subject: refactor: replace remaining binascii method calls

---
 test/functional/test_framework/messages.py | 3 +--
 test/util/bitcoin-util-test.py             | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
index 6e57107f86..65d90f8448 100755
--- a/test/functional/test_framework/messages.py
+++ b/test/functional/test_framework/messages.py
@@ -19,7 +19,6 @@ Classes use __slots__ to ensure extraneous attributes aren't accidentally added
 by tests, compromising their intended effect.
 """
 from base64 import b32decode, b32encode
-from codecs import encode
 import copy
 import hashlib
 from io import BytesIO
@@ -681,7 +680,7 @@ class CBlockHeader:
             r += struct.pack("<I", self.nBits)
             r += struct.pack("<I", self.nNonce)
             self.sha256 = uint256_from_str(hash256(r))
-            self.hash = encode(hash256(r)[::-1], 'hex_codec').decode('ascii')
+            self.hash = hash256(r)[::-1].hex()
 
     def rehash(self):
         self.sha256 = None
diff --git a/test/util/bitcoin-util-test.py b/test/util/bitcoin-util-test.py
index 7b1cc2b031..aa8fd6eee5 100755
--- a/test/util/bitcoin-util-test.py
+++ b/test/util/bitcoin-util-test.py
@@ -10,7 +10,6 @@ Runs automatically during `make check`.
 Can also be run manually."""
 
 import argparse
-import binascii
 import configparser
 import difflib
 import json
@@ -167,7 +166,7 @@ def parse_output(a, fmt):
     if fmt == 'json':  # json: compare parsed data
         return json.loads(a)
     elif fmt == 'hex':  # hex: parse and compare binary data
-        return binascii.a2b_hex(a.strip())
+        return bytes.fromhex(a.strip())
     else:
         raise NotImplementedError("Don't know how to compare %s" % fmt)
 
-- 
cgit v1.2.3