sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 11:32:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#22633: Replace remaining binascii method calls

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2021-08-16 19:30:44 +01:00
parent b37f609fd0
commit ad96ef2d25
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/linearize/linearize-data.py
View File

@ -17,7 +17,6 @@ import datetime
import time import time
import glob import glob
from collections import namedtuple from collections import namedtuple
from binascii import unhexlify
settings = {} settings = {}
@ -324,7 +323,7 @@ if __name__ == '__main__':
settings['max_out_sz'] = int(settings['max_out_sz']) settings['max_out_sz'] = int(settings['max_out_sz'])
settings['split_timestamp'] = int(settings['split_timestamp']) settings['split_timestamp'] = int(settings['split_timestamp'])
settings['file_timestamp'] = int(settings['file_timestamp']) settings['file_timestamp'] = int(settings['file_timestamp'])
settings['netmagic'] = unhexlify(settings['netmagic'].encode('utf-8')) settings['netmagic'] = bytes.fromhex(settings['netmagic'])
settings['out_of_order_cache_sz'] = int(settings['out_of_order_cache_sz']) settings['out_of_order_cache_sz'] = int(settings['out_of_order_cache_sz'])
settings['debug_output'] = settings['debug_output'].lower() settings['debug_output'] = settings['debug_output'].lower()

3
share/rpcauth/rpcauth.py
View File

@ -5,7 +5,6 @@
from argparse import ArgumentParser from argparse import ArgumentParser
from base64 import urlsafe_b64encode from base64 import urlsafe_b64encode
from binascii import hexlify
from getpass import getpass from getpass import getpass
from os import urandom from os import urandom
@ -13,7 +12,7 @@ import hmac
def generate_salt(size): def generate_salt(size):
"""Create size byte hex salt""" """Create size byte hex salt"""
return hexlify(urandom(size)).decode() return urandom(size).hex()
def generate_password(): def generate_password():
"""Create 32 byte b64 password""" """Create 32 byte b64 password"""

5
src/test/serfloat_tests.cpp
View File

@ -102,11 +102,12 @@ BOOST_AUTO_TEST_CASE(double_serfloat_tests) {
Python code to generate the below hashes: Python code to generate the below hashes:
def reversed_hex(x): def reversed_hex(x):
return binascii.hexlify(''.join(reversed(x))) return bytes(reversed(x)).hex()
def dsha256(x): def dsha256(x):
return hashlib.sha256(hashlib.sha256(x).digest()).digest() return hashlib.sha256(hashlib.sha256(x).digest()).digest()
reversed_hex(dsha256(''.join(struct.pack('<d', x) for x in range(0,1000)))) == '43d0c82591953c4eafe114590d392676a01585d25b25d433557f0d7878b23f96' reversed_hex(dsha256(b''.join(struct.pack('<d', x) for x in range(0,1000)))) == '43d0c82591953c4eafe114590d392676a01585d25b25d433557f0d7878b23f96'
*/ */
BOOST_AUTO_TEST_CASE(doubles) BOOST_AUTO_TEST_CASE(doubles)
{ {

3
test/util/bitcoin-util-test.py
View File

@ -10,7 +10,6 @@ Runs automatically during `make check`.
Can also be run manually.""" Can also be run manually."""
import argparse import argparse
import binascii
import configparser import configparser
import difflib import difflib
import json import json
@ -167,7 +166,7 @@ def parse_output(a, fmt):
if fmt == 'json': # json: compare parsed data if fmt == 'json': # json: compare parsed data
return json.loads(a) return json.loads(a)
elif fmt == 'hex': # hex: parse and compare binary data elif fmt == 'hex': # hex: parse and compare binary data
return binascii.a2b_hex(a.strip()) return bytes.fromhex(a.strip())
else: else:
raise NotImplementedError("Don't know how to compare %s" % fmt) raise NotImplementedError("Don't know how to compare %s" % fmt)