1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-07 15:18:08 +00:00

tools: drop binascii usage

This commit is contained in:
Pavol Rusnak 2018-09-13 00:14:51 +02:00
parent eca9402772
commit 23b07f975d
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 3 additions and 5 deletions

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
from binascii import unhexlify
from collections import defaultdict, OrderedDict from collections import defaultdict, OrderedDict
import re import re
import os import os
@ -232,7 +231,7 @@ def _load_erc20_tokens():
token.update( token.update(
chain=chain, chain=chain,
chain_id=network["chain_id"], chain_id=network["chain_id"],
address_bytes=unhexlify(token["address"][2:]), address_bytes=bytes.fromhex(token["address"][2:]),
shortcut=token["symbol"], shortcut=token["symbol"],
key="erc20:{}:{}".format(chain, token["symbol"]), key="erc20:{}:{}".format(chain, token["symbol"]),
) )

View File

@ -6,7 +6,6 @@ import re
import sys import sys
import os import os
import glob import glob
import binascii
import struct import struct
import zlib import zlib
from collections import defaultdict from collections import defaultdict
@ -430,7 +429,7 @@ def coindef_from_dict(coin):
elif fname == "signed_message_header": elif fname == "signed_message_header":
val = val.encode() val = val.encode()
elif fname == "hash_genesis_block": elif fname == "hash_genesis_block":
val = binascii.unhexlify(val) val = bytes.fromhex(val)
setattr(proto, fname, val) setattr(proto, fname, val)
return proto return proto
@ -629,7 +628,7 @@ def coindefs(outfile):
icon = Image.open(coin["icon"]) icon = Image.open(coin["icon"])
ser = serialize_coindef(coindef_from_dict(coin), convert_icon(icon)) ser = serialize_coindef(coindef_from_dict(coin), convert_icon(icon))
sig = sign(ser) sig = sign(ser)
definition = binascii.hexlify(sig + ser).decode() definition = (sig + ser).hex()
coindefs[key] = definition coindefs[key] = definition
with outfile: with outfile: