From c20fe1960d0b0f7b85b12c688d7279d4429c31c0 Mon Sep 17 00:00:00 2001 From: Ouziel Slama Date: Wed, 5 Mar 2025 14:35:40 +0000 Subject: [PATCH] patch coverage --- .../counterpartycore/lib/messages/versions/enhancedsend.py | 2 +- .../counterpartycore/test/units/messages/sweep_test.py | 5 +++++ .../test/units/messages/versions/enhancedsend_test.py | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/counterparty-core/counterpartycore/lib/messages/versions/enhancedsend.py b/counterparty-core/counterpartycore/lib/messages/versions/enhancedsend.py index e8ab94a0e..e8140b91d 100644 --- a/counterparty-core/counterpartycore/lib/messages/versions/enhancedsend.py +++ b/counterparty-core/counterpartycore/lib/messages/versions/enhancedsend.py @@ -67,7 +67,7 @@ def unpack(message): if asset == config.BTC: raise exceptions.AssetNameError(f"{config.BTC} not allowed") - except struct.error as e: + except (struct.error, TypeError) as e: logger.trace(f"enhanced send unpack error: {e}") raise exceptions.UnpackError(f"could not unpack: {e}") # noqa: B904 diff --git a/counterparty-core/counterpartycore/test/units/messages/sweep_test.py b/counterparty-core/counterpartycore/test/units/messages/sweep_test.py index eda59ce41..84a963e29 100644 --- a/counterparty-core/counterpartycore/test/units/messages/sweep_test.py +++ b/counterparty-core/counterpartycore/test/units/messages/sweep_test.py @@ -159,6 +159,11 @@ def test_new_unpack(defaults): b"\x15\x01\x9c\x8d\x1fT\x05E\x1d\xe6\x07\x0b\xf1\xdb\x86\xabj\xcc\xb4\x95\xb6%\x01\x03\x04test" ) == {"destination": defaults["addresses"][5], "flags": 3, "memo": "test"} + with pytest.raises(exceptions.UnpackError, match="could not unpack"): + sweep.new_unpack( + b"\x01\x9c\x8d\x1fT\x05E\x1d\xe6\x07\x0b\xf1\xdb\x86\xabj\xcc\xb4\x95\xb6%\x01\x03" + ) + def test_unpack(defaults): with ProtocolChangesDisabled("taproot_support"): diff --git a/counterparty-core/counterpartycore/test/units/messages/versions/enhancedsend_test.py b/counterparty-core/counterpartycore/test/units/messages/versions/enhancedsend_test.py index a82127351..0f5315aa8 100644 --- a/counterparty-core/counterpartycore/test/units/messages/versions/enhancedsend_test.py +++ b/counterparty-core/counterpartycore/test/units/messages/versions/enhancedsend_test.py @@ -90,3 +90,10 @@ def test_unpack(ledger_db, defaults): enhancedsend.unpack( b'\x01\x00\x02\xe8\x03"\x03\x01qe0u\xb3n\xe3\xd25\x1bU\x81\xd9\xb9\x90W!\xcb\xfe`\xb7\x1c\xe2%\x01\xe1\xb4N\xd0:\x96\x84\x03\xab\xcd\xef' ) + + with ProtocolChangesDisabled(["taproot_support"]): + with pytest.raises(exceptions.UnpackError, match="could not unpack"): + result = enhancedsend.unpack( + "x02\xe1\xb4N\xd0:\x96x02\xe1\xb4N\xd0:\x96x02\xe1\xb4N\xd0:\x96x02\xe1\xb4N\xd0:\x96a" + ) + print(result)