From b212b0136d4add7c4fc06ae898d470cd842ab08e Mon Sep 17 00:00:00 2001
From: Jon Michael Aanes <jonjmaa@gmail.com>
Date: Fri, 3 May 2024 10:18:54 +0200
Subject: [PATCH] Fixed parsing of AvlTree

---
 .gitignore                                    |   2 ++
 pbcabi/model.py                               |  15 ++++++++++++++
 ...A781D389D7C7CAAF836E5E47ABED6CEFD2D928.abi | Bin 0 -> 4007 bytes
 test/test_address.py                          |  19 ++++++++++++++++++
 test/test_binaryreader.py                     |  18 +++++++++++++++++
 5 files changed, 54 insertions(+)
 create mode 100644 test/example-abis/025FA781D389D7C7CAAF836E5E47ABED6CEFD2D928.abi
 create mode 100644 test/test_address.py
 create mode 100644 test/test_binaryreader.py

diff --git a/.gitignore b/.gitignore
index 9c882b7..bade9fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 __pycache__/
 *.egg-info/
+.mypy_cache/
+/build/
diff --git a/pbcabi/model.py b/pbcabi/model.py
index 793083b..b25c023 100644
--- a/pbcabi/model.py
+++ b/pbcabi/model.py
@@ -14,6 +14,9 @@ from enum import Enum
 import enforce_typing
 from .binaryreader import BinaryReader
 import pbcabi.data as data
+import logging
+
+logger = logging.getLogger(__name__)
 
 Identifier = str
 
@@ -242,6 +245,16 @@ class AvlTreeTypeSpec(MapTypeSpec):
     '''
     DISCRIMINANT = 0x19
 
+    @staticmethod
+    def read_from(reader: BinaryReader):
+        '''
+        Deserialize this 'TypeSpec' type from 'BinaryReader'.
+        '''
+        type_key = TypeSpec.read_from(reader)
+        type_value = TypeSpec.read_from(reader)
+        type_spec = AvlTreeTypeSpec(type_key, type_value)
+        return type_spec
+
 @enforce_typing.enforce_types
 @dataclasses.dataclass(frozen=True, slots=True)
 class InlineMapTypeSpec(MapTypeSpec):
@@ -528,6 +541,8 @@ class StructTypeSpec(NamedTypeSpec):
         '''
         Deserialize this 'TypeSpec' type from 'BinaryReader'.
         '''
+
+        logger.debug('Reading Struct')
         name = reader.readString()
         variants = reader.readList(FieldAbi.read_from)
         type_spec = StructTypeSpec(name, type_index, variants)
diff --git a/test/example-abis/025FA781D389D7C7CAAF836E5E47ABED6CEFD2D928.abi b/test/example-abis/025FA781D389D7C7CAAF836E5E47ABED6CEFD2D928.abi
new file mode 100644
index 0000000000000000000000000000000000000000..520919865f435aa385d60aaf08756aaf7af70bf2
GIT binary patch
literal 4007
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
YnzAzh%R^$hX{AfG%K(0@0!FO&4;N_2O8@`>

literal 0
HcmV?d00001

diff --git a/test/test_address.py b/test/test_address.py
new file mode 100644
index 0000000..17c3898
--- /dev/null
+++ b/test/test_address.py
@@ -0,0 +1,19 @@
+import pytest
+from pathlib import Path
+from pbcabi.binaryreader import BinaryReader
+import pbcabi.model
+from pbcabi.data import BlockchainAddress
+
+EXAMPLE_SHARDS = [
+        ("Shard1", 2, "000000000000000000000000000000000000000001"),
+        ("Shard0", 2, "000000000000000000000000000000000000000002"),
+        ("Shard0", 3, "025FA781D389D7C7CAAF836E5E47ABED6CEFD2D928"),
+        ("Shard1", 3, "04FE17D1009372C8ED3AC5B790B32E349359C2C7E9"),
+        ("Shard0", 3, "01A2020BB33EF9E0323C7A3210D5CB7FD492AA0D65"),
+]
+
+@pytest.mark.parametrize('shard_id,num_shards,address', EXAMPLE_SHARDS)
+def test_parse_abi(shard_id: int, num_shards:int, address: str):
+    address = BlockchainAddress.from_hex_hash(address)
+    assert address.shard_id(num_shards) == shard_id
+
diff --git a/test/test_binaryreader.py b/test/test_binaryreader.py
new file mode 100644
index 0000000..27e8c93
--- /dev/null
+++ b/test/test_binaryreader.py
@@ -0,0 +1,18 @@
+import pytest
+from pathlib import Path
+from pbcabi.binaryreader import BinaryReader
+import pbcabi.model
+
+def assert_parse(hex, value):
+    derp = bytes.fromhex(hex)
+    assert BinaryReader(derp).readSignedIntBigEndian(1) == value
+
+def test_parse():
+    assert_parse('00', 0)
+    assert_parse('01', 1)
+    assert_parse('10', 0x10)
+    assert_parse('79', 0x79)
+    assert_parse('80', -0x80)
+    assert_parse('F0', -16)
+    assert_parse('FF', -1)
+