highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-10-10 19:43:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

[tests] Rename segwit encode and decode functions

Browse Source 
These functions can be exported to other modules,
so be explicit that they're encoding and decoding
segwit addresses
This commit is contained in:
John Newbery
2020-06-11 13:45:31 -04:00
parent e4557133f5
commit 011e784f74
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/functional/test_framework/segwit_addr.py
View File

@@ -84,7 +84,7 @@ def convertbits(data, frombits, tobits, pad=True):
return ret
def decode(hrp, addr):
def decode_segwit_address(hrp, addr):
"""Decode a segwit address."""
hrpgot, data = bech32_decode(addr)
if hrpgot != hrp:
@@ -99,10 +99,10 @@ def decode(hrp, addr):
return (data[0], decoded)
def encode(hrp, witver, witprog):
def encode_segwit_address(hrp, witver, witprog):
"""Encode a segwit address."""
ret = bech32_encode(hrp, [witver] + convertbits(witprog, 8, 5))
if decode(hrp, ret) == (None, None):
if decode_segwit_address(hrp, ret) == (None, None):
return None
return ret
@@ -111,8 +111,8 @@ class TestFrameworkScript(unittest.TestCase):
def test_python_bech32(addr):
hrp = addr[:4]
self.assertEqual(hrp, "bcrt")
(witver, witprog) = decode(hrp, addr)
self.assertEqual(encode(hrp, witver, witprog), addr)
(witver, witprog) = decode_segwit_address(hrp, addr)
self.assertEqual(encode_segwit_address(hrp, witver, witprog), addr)
# P2WPKH
test_python_bech32('bcrt1qthmht0k2qnh3wy7336z05lu2km7emzfpm3wg46')