Skip to content

Commit

Permalink
Merge bitcoin#24324: test: refactor: remove unneeded bytes<->hex conv…
Browse files Browse the repository at this point in the history
…ersions in `byte_to_base58`

f11dad2 test: refactor: remove unneeded bytes<->hex conversions in `byte_to_base58` (Sebastian Falbesoner)

Pull request description:

  It seems like the only reason for using hex strings in this method was to have a convenient way to convert to an integer from the input data interpreted as big-endian. In Python3 we have `int.from_bytes(..., 'big')` for that purpose, hence there is no need for that anymore and we can simply operate on bytes only.

ACKs for top commit:
  laanwj:
    Code review ACK f11dad2

Tree-SHA512: 9b1563010066ca74d85139c3b9259e9a5bb49e1f141c30b6506a0445afddb2bde7fd421fdd917dc516956e66f93610e2c21d720817640daee8f57f803be76ee4
  • Loading branch information
MarcoFalke committed Feb 15, 2022
2 parents 566df80 + f11dad2 commit 7164e00
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions test/functional/test_framework/address.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,15 @@ def create_deterministic_address_bcrt1_p2tr_op_true():

def byte_to_base58(b, version):
result = ''
str = b.hex()
str = chr(version).encode('latin-1').hex() + str
checksum = hash256(bytes.fromhex(str)).hex()
str += checksum[:8]
value = int('0x' + str, 0)
b = bytes([version]) + b # prepend version
b += hash256(b)[:4] # append checksum
value = int.from_bytes(b, 'big')
while value > 0:
result = chars[value % 58] + result
value //= 58
while (str[:2] == '00'):
while b[0] == 0:
result = chars[0] + result
str = str[2:]
b = b[1:]
return result


Expand Down

0 comments on commit 7164e00

Please sign in to comment.