From ca4a07f766f7c59e200346bd257de2caf956e9e0 Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Wed, 20 Mar 2019 01:36:30 -0400 Subject: [PATCH] ledger.is_valid_address added --- torba/client/baseledger.py | 5 +++++ torba/client/basescript.py | 2 +- torba/testcase.py | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/torba/client/baseledger.py b/torba/client/baseledger.py index 721236e07..1f35fb2eb 100644 --- a/torba/client/baseledger.py +++ b/torba/client/baseledger.py @@ -153,6 +153,11 @@ class BaseLedger(metaclass=LedgerRegistry): def address_to_hash160(address): return Base58.decode(address)[1:21] + @classmethod + def is_valid_address(cls, address): + decoded = Base58.decode(address) + return decoded[0] == cls.pubkey_address_prefix + @classmethod def public_key_to_address(cls, public_key): return cls.hash160_to_address(hash160(public_key)) diff --git a/torba/client/basescript.py b/torba/client/basescript.py index a849a9346..560525c09 100644 --- a/torba/client/basescript.py +++ b/torba/client/basescript.py @@ -64,7 +64,7 @@ def push_data(data): else: yield BCDataStream.uint8.pack(OP_PUSHDATA4) yield BCDataStream.uint32.pack(size) - yield data + yield bytes(data) def read_data(token, stream): diff --git a/torba/testcase.py b/torba/testcase.py index 7e3913bb8..42390ee07 100644 --- a/torba/testcase.py +++ b/torba/testcase.py @@ -61,6 +61,8 @@ class AsyncioTestCase(unittest.TestCase): # Implementation inspired by discussion: # https://bugs.python.org/issue32972 + maxDiff = None + async def asyncSetUp(self): # pylint: disable=C0103 pass