change to helper

Author: camfairchild

async_substrate_interface/async_substrate.py

@@ -55,7 +55,10 @@
     Preprocessed,
 )
 from async_substrate_interface.utils import hex_to_bytes, json
-from async_substrate_interface.utils.decoding import _determine_if_old_runtime_call
+from async_substrate_interface.utils.decoding import (
+    _determine_if_old_runtime_call,
+    _bt_decode_to_dict_or_list,
+)
 from async_substrate_interface.utils.storage import StorageKey
 from async_substrate_interface.type_registry import _TYPE_REGISTRY
 
@@ -2576,21 +2579,10 @@ async def _do_runtime_call_old(
         result_vec_u8_bytes = hex_to_bytes(result_data["result"])
         result_bytes = await self.decode_scale("Vec<u8>", result_vec_u8_bytes)
 
-        def _as_dict(obj):
-            as_dict = {}
-            for key in dir(obj):
-                if not key.startswith("_"):
-                    val = getattr(obj, key)
-                    if isinstance(val, (OldAxonInfo, OldPrometheusInfo)):
-                        as_dict[key] = _as_dict(val)
-                    else:
-                        as_dict[key] = val
-            return as_dict
-
         # Decode result
         # Get correct type
         result_decoded = runtime_call_def["decoder"](bytes(result_bytes))
-        as_dict = _as_dict(result_decoded)
+        as_dict = _bt_decode_to_dict_or_list(result_decoded)
         logging.debug("Decoded old runtime call result: ", as_dict)
         result_obj = ScaleObj(as_dict)
 

async_substrate_interface/sync_substrate.py

@@ -36,7 +36,10 @@
     ScaleObj,
 )
 from async_substrate_interface.utils import hex_to_bytes, json
-from async_substrate_interface.utils.decoding import _determine_if_old_runtime_call
+from async_substrate_interface.utils.decoding import (
+    _determine_if_old_runtime_call,
+    _bt_decode_to_dict_or_list,
+)
 from async_substrate_interface.utils.storage import StorageKey
 from async_substrate_interface.type_registry import _TYPE_REGISTRY
 
@@ -2289,21 +2292,10 @@ def _do_runtime_call_old(
         result_vec_u8_bytes = hex_to_bytes(result_data["result"])
         result_bytes = self.decode_scale("Vec<u8>", result_vec_u8_bytes)
 
-        def _as_dict(obj):
-            as_dict = {}
-            for key in dir(obj):
-                if not key.startswith("_"):
-                    val = getattr(obj, key)
-                    if isinstance(val, (OldAxonInfo, OldPrometheusInfo)):
-                        as_dict[key] = _as_dict(val)
-                    else:
-                        as_dict[key] = val
-            return as_dict
-
         # Decode result
         # Get correct type
         result_decoded = runtime_call_def["decoder"](bytes(result_bytes))
-        as_dict = _as_dict(result_decoded)
+        as_dict = _bt_decode_to_dict_or_list(result_decoded)
         logging.debug("Decoded old runtime call result: ", as_dict)
         result_obj = ScaleObj(as_dict)
 

async_substrate_interface/utils/decoding.py

@@ -1,3 +1,6 @@
+from bt_metadata import AxonInfo, PrometheusInfo
+
+
 def _determine_if_old_runtime_call(runtime_call_def, metadata_v15_value) -> bool:
     # Check if the output type is a Vec<u8>
     # If so, call the API using the old method
@@ -24,3 +27,18 @@ def _determine_if_old_runtime_call(runtime_call_def, metadata_v15_value) -> bool
                 ):
                     return True
     return False
+
+
+def _bt_decode_to_dict_or_list(obj) -> dict | list[dict]:
+    if isinstance(obj, list):
+        return [_bt_decode_to_dict_or_list(item) for item in obj]
+
+    as_dict = {}
+    for key in dir(obj):
+        if not key.startswith("_"):
+            val = getattr(obj, key)
+            if isinstance(val, (AxonInfo, PrometheusInfo)):
+                as_dict[key] = _bt_decode_to_dict_or_list(val)
+            else:
+                as_dict[key] = val
+    return as_dict