jamcodec 0.1.2__tar.gz → 0.1.4__tar.gz

{jamcodec-0.1.2 → jamcodec-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jamcodec
-Version: 0.1.2
+Version: 0.1.4
 Summary: Python JAM Codec Library
 Author-email: JAMdot Technologies <dev@jamdot.tech>
 Project-URL: Homepage, https://github.com/JAMdotTech/py-jam-codec

{jamcodec-0.1.2 → jamcodec-0.1.4}/jamcodec/base.py

@@ -115,6 +115,13 @@ class JamBytes:
             return False
         return self.data == other.data
 
+
+    def __lt__(self, other):
+        return self.data < other.data
+
+    def __gt__(self, other):
+        return self.data > other.data
+
     def __len__(self):
         return len(self.data)
 

{jamcodec-0.1.2 → jamcodec-0.1.4}/jamcodec/types.py

@@ -371,8 +371,11 @@ class Enum(JamCodecTypeDef):
 
         for idx, (variant_name, variant_obj) in enumerate(self.variants.items()):
 
-            if enum_key == variant_name:
+            if type(variant_obj) is dict:
+                idx = variant_obj.get('id', idx)
+                variant_obj = variant_obj.get('type', variant_obj)
 
+            if enum_key == variant_name:
                 data = JamBytes(bytearray([idx]))
 
                 if variant_obj is not None:
@@ -387,9 +390,19 @@ class Enum(JamCodecTypeDef):
 
         index = int.from_bytes(data.get_next_bytes(1), byteorder='little')
 
-        try:
-            enum_key, enum_variant = list(self.variants.items())[index]
-        except IndexError:
+        enum_key = None
+        enum_variant = None
+
+        for idx, (variant_key, variant_obj) in enumerate(self.variants.items()):
+            if type(variant_obj) is dict:
+                idx = variant_obj.get('id', idx)
+                variant_obj = variant_obj.get('type', variant_obj)
+            if index == idx:
+                enum_key = variant_key
+                enum_variant = variant_obj
+                break
+
+        if enum_key is None:
             raise ScaleDecodeException(f"Index '{index}' not present in Enum type mapping")
 
         if enum_variant is None:
@@ -434,6 +447,9 @@ class Enum(JamCodecTypeDef):
 
         for idx, (variant_name, variant_obj) in enumerate(self.variants.items()):
 
+            if type(variant_obj) is dict:
+                variant_obj = variant_obj.get('type', variant_obj)
+
             if enum_key == variant_name:
 
                 if variant_obj is not None:
@@ -961,8 +977,8 @@ class Map(JamCodecTypeDef):
             # Convert to list
             value = value.items()
 
-        # Sort Map by keys
-        value = sorted(value, key=lambda x: x[0])
+        # Sort Map by keys and then values
+        value = sorted(value)
 
         # Encode length of Vec
         data = VarInt64.encode(len(value))

{jamcodec-0.1.2 → jamcodec-0.1.4}/jamcodec.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jamcodec
-Version: 0.1.2
+Version: 0.1.4
 Summary: Python JAM Codec Library
 Author-email: JAMdot Technologies <dev@jamdot.tech>
 Project-URL: Homepage, https://github.com/JAMdotTech/py-jam-codec

{jamcodec-0.1.2 → jamcodec-0.1.4}/test/test_enum.py

@@ -17,7 +17,7 @@
 
 import unittest
 
-from jamcodec.types import Enum, Bool, U32
+from jamcodec.types import Enum, Bool, U32, String
 
 
 class TestEnum(unittest.TestCase):
@@ -60,6 +60,14 @@ class TestEnum(unittest.TestCase):
         scale_obj.deserialize('None')
         self.assertEqual(('None', None), scale_obj.value_object)
 
+    def test_enum_explicit_id(self):
+        scale_obj = Enum(Bool=Bool(), Number=U32, Error={'id': 255, 'type': String}).new()
+        jam_bytes = scale_obj.encode({'Error': 'test'})
+        self.assertEqual('0xff0474657374', jam_bytes.to_hex())
+
+        value = scale_obj.decode(jam_bytes)
+        self.assertEqual({'Error': 'test'}, value)
+        
 
 if __name__ == '__main__':
     unittest.main()

{jamcodec-0.1.2 → jamcodec-0.1.4}/test/test_map.py

@@ -56,6 +56,25 @@ class TestMap(unittest.TestCase):
             data
         )
 
+    def test_map_encode_sort_key_values(self):
+        obj = Map(U32, U32).new()
+        value = [
+            (2, 1),
+            (2, 2),
+            (1, 2),
+            (1, 1)
+        ]
+
+        data = obj.encode(value)
+
+        self.assertEqual(
+            JamBytes(
+                "0x040100000001000000010000000200000002000000010000000200000002000000"
+            ),
+            data
+        )
+
+
     def test_map_decode(self):
         obj = Map(U32, Bytes).new()