Refactor lib9c models

common/lib9c/models/address.py

@@ -0,0 +1,24 @@
+from __future__ import annotations
+
+
+class Address:
+    def __init__(self, addr: str):
+        if addr.startswith("0x"):
+            if len(addr) != 42:
+                raise ValueError("Address with 0x prefix must have exact 42 chars.")
+            self.raw = bytes.fromhex(addr[2:])
+        else:
+            if len(addr) != 40:
+                raise ValueError("Address without 0x prefix must have exact 40 chars.")
+            self.raw = bytes.fromhex(addr)
+
+    @property
+    def long_format(self):
+        return f"0x{self.raw.hex()}"
+
+    @property
+    def short_format(self):
+        return self.raw.hex()
+
+    def __eq__(self, other: Address):
+        return self.raw == other.raw

tests/lib9c/models/test_address.py

@@ -0,0 +1,20 @@
+import pytest
+
+from common.lib9c.models.address import Address
+
+
+@pytest.mark.parametrize("addr",
+                         ["0xa5f7e0bd63AD2749D66380f36Eb33Fe0ba50A27D",
+                          "0xb3cbca0e64aeb4b5b861047fe1db5a1bec1c241f",
+                          "a5f7e0bd63AD2749D66380f36Eb33Fe0ba50A27D",
+                          "b3cbca0e64aeb4b5b861047fe1db5a1bec1c241f",
+                          ])
+def test_address(addr):
+    address = Address(addr)
+    assert len(address.raw) == 20
+    if addr.startswith("0x"):
+        assert address.raw == bytes.fromhex(addr[2:])
+        assert address.long_format == addr.lower()
+    else:
+        assert address.raw == bytes.fromhex(addr)
+        assert address.short_format == addr.lower()