fix: second attempt at cyclomatic for token info

Signed-off-by: exploreriii <[email protected]>

Author: exploreriii

src/hiero_sdk_python/tokens/token_info.py

@@ -28,7 +28,7 @@
 from hiero_sdk_python._deprecated import _DeprecatedAliasesMixin
 from hiero_sdk_python.tokens.custom_fee import CustomFee
 from hiero_sdk_python.hapi.services import token_get_info_pb2 as hapi_pb
-from hiero_sdk_python.hapi.services import basic_types_pb2 as basic_pb
+
 
 @dataclass(init=False)
 class TokenInfo(_DeprecatedAliasesMixin):
@@ -90,7 +90,7 @@ class TokenInfo(_DeprecatedAliasesMixin):
         "pauseStatus":         "pause_status",
         "supplyType":          "supply_type",
         "customFees":          "custom_fees",
-    } 
+    }
 
     def __init__(self, **kwargs: Any) -> None:
         # 1) Translate deprecated camelCase names → snake_case, with warnings
@@ -132,7 +132,7 @@ def set_kyc_key(self, kyc_key: PublicKey) -> "TokenInfo":
         """Set the KYC key."""
         self.kyc_key = kyc_key
         return self
-    
+
     # alias for backwards compatibility
     set_kycKey = set_kyc_key
 
@@ -245,6 +245,40 @@ def set_custom_fees(self, custom_fees: List[Any]) -> "TokenInfo":
     # alias for backwards compatibility
     set_customFees = set_custom_fees
 
+    # === helpers ===
+    @staticmethod
+    def _copy_key_if_present(dst: "TokenInfo", setter: str, key_msg) -> None:
+        # In proto3, keys are a oneof; check presence via WhichOneof
+        if key_msg is not None and hasattr(key_msg, "WhichOneof") and key_msg.WhichOneof("key"):
+            getattr(dst, setter)(PublicKey._from_proto(key_msg))
+
+    @staticmethod
+    def _parse_custom_fees(proto_obj) -> List[CustomFee]:
+        out: List[CustomFee] = []
+        for fee_proto in getattr(proto_obj, "custom_fees", []):  # snake_case matches your generated proto
+            if fee_proto.HasField("fixed_fee"):
+                out.append(CustomFixedFee._from_proto(fee_proto))
+            elif fee_proto.HasField("fractional_fee"):
+                out.append(CustomFractionalFee._from_proto(fee_proto))
+            elif fee_proto.HasField("royalty_fee"):
+                out.append(CustomRoyaltyFee._from_proto(fee_proto))
+        return out
+
+    @staticmethod
+    def _copy_msg_to_proto(src_obj, dst_proto, src_attr: str, dst_field: str) -> None:
+        val = getattr(src_obj, src_attr)
+        if val:
+            getattr(dst_proto, dst_field).CopyFrom(val._to_proto())
+
+    @staticmethod
+    def _get(proto_obj, *names):
+        """Get the first present attribute from a list of possible names (camelCase/snake_case)."""
+        for n in names:
+            if hasattr(proto_obj, n):
+                return getattr(proto_obj, n)
+        return None
+
+    # === conversions ===
     @classmethod
     def _from_proto(cls, proto_obj: hapi_pb.TokenInfo) -> "TokenInfo":
         """
@@ -267,43 +301,35 @@ def _from_proto(cls, proto_obj: hapi_pb.TokenInfo) -> "TokenInfo":
             metadata=proto_obj.metadata,
         )
 
-        fees: List[CustomFee] = []
-        for fee_proto in getattr(proto_obj, "custom_fees", []):  # snake_case matches your generated proto
-            if fee_proto.HasField("fixed_fee"):
-                fees.append(CustomFixedFee._from_proto(fee_proto))          # pass the wrapper
-            elif fee_proto.HasField("fractional_fee"):
-                fees.append(CustomFractionalFee._from_proto(fee_proto))     # pass the wrapper
-            elif fee_proto.HasField("royalty_fee"):
-                fees.append(CustomRoyaltyFee._from_proto(fee_proto))        # pass the wrapper
-
-        tokenInfoObject.set_custom_fees(fees)
-
-        for proto_attr, setter in [
-            ("adminKey", "set_admin_key"),
-            ("kycKey", "set_kyc_key"),
-            ("freezeKey", "set_freeze_key"),
-            ("wipeKey", "set_wipe_key"),
-            ("supplyKey", "set_supply_key"),
-            ("metadata_key", "set_metadata_key"),
-            ("fee_schedule_key", "set_fee_schedule_key"),
-            ("pause_key", "set_pause_key"),
-        ]:
-            key_field = getattr(proto_obj, proto_attr)
-            if key_field.WhichOneof("key"):
-                getattr(tokenInfoObject, setter)(PublicKey._from_proto(key_field))
-
-        for proto_attr, setter, conv in [
-            ("defaultFreezeStatus", "set_default_freeze_status", TokenFreezeStatus._from_proto),
-            ("defaultKycStatus", "set_default_kyc_status", TokenKycStatus._from_proto),
-            ("autoRenewAccount", "set_auto_renew_account", AccountId._from_proto),
-            ("autoRenewPeriod", "set_auto_renew_period", Duration._from_proto),
-            ("expiry", "set_expiry", Timestamp._from_protobuf),
-            ("pause_status", "set_pause_status", TokenPauseStatus._from_proto),
-            ("supplyType", "set_supply_type", SupplyType),
-        ]:
-            val = getattr(proto_obj, proto_attr)
+        tokenInfoObject.set_custom_fees(cls._parse_custom_fees(proto_obj))
+
+        key_sources = [
+            (("adminKey",),                         "set_admin_key"),
+            (("kycKey",),                           "set_kyc_key"),
+            (("freezeKey",),                        "set_freeze_key"),
+            (("wipeKey",),                          "set_wipe_key"),
+            (("supplyKey",),                        "set_supply_key"),
+            (("metadataKey", "metadata_key"),       "set_metadata_key"),
+            (("feeScheduleKey", "fee_schedule_key"),"set_fee_schedule_key"),
+            (("pauseKey", "pause_key"),             "set_pause_key"),
+        ]
+        for names, setter in key_sources:
+            key_msg = cls._get(proto_obj, *names)
+            cls._copy_key_if_present(tokenInfoObject, setter, key_msg)
+
+        conv_map = [
+            (("defaultFreezeStatus",), tokenInfoObject.set_default_freeze_status, TokenFreezeStatus._from_proto),
+            (("defaultKycStatus",),    tokenInfoObject.set_default_kyc_status,    TokenKycStatus._from_proto),
+            (("autoRenewAccount",),    tokenInfoObject.set_auto_renew_account,    AccountId._from_proto),
+            (("autoRenewPeriod",),     tokenInfoObject.set_auto_renew_period,     Duration._from_proto),
+            (("expiry",),              tokenInfoObject.set_expiry,                Timestamp._from_protobuf),
+            (("pauseStatus", "pause_status"), tokenInfoObject.set_pause_status,   TokenPauseStatus._from_proto),
+            (("supplyType",),          tokenInfoObject.set_supply_type,           SupplyType),
+        ]
+        for names, setter, conv in conv_map:
+            val = cls._get(proto_obj, *names)
             if val is not None:
-                getattr(tokenInfoObject, setter)(conv(val))
+                setter(conv(val))
 
         return tokenInfoObject
 
@@ -322,28 +348,25 @@ def _to_proto(self) -> hapi_pb.TokenInfo:
             tokenType=(self.token_type.value if self.token_type else None),
             supplyType=(self.supply_type.value if self.supply_type else None),
             maxSupply=self.max_supply,
-            expiry=self.expiry._to_protobuf() if self.expiry else None,
             ledger_id=self.ledger_id,
             metadata=self.metadata,
         )
 
-        for fee in self.custom_fees:
+        for fee in self.custom_fees or []:
             proto.custom_fees.append(fee._to_proto())
 
-        for attr, field in [
-            ("admin_key", "adminKey"),
-            ("kyc_key", "kycKey"),
-            ("freeze_key", "freezeKey"),
-            ("wipe_key", "wipeKey"),
-            ("supply_key", "supplyKey"),
-            ("metadata_key", "metadata_key"),
-            ("fee_schedule_key", "fee_schedule_key"),
-            ("pause_key", "pause_key"),
+        for src_attr, dst_field in [
+            ("admin_key",          "adminKey"),
+            ("kyc_key",            "kycKey"),
+            ("freeze_key",         "freezeKey"),
+            ("wipe_key",           "wipeKey"),
+            ("supply_key",         "supplyKey"),
+            ("metadata_key",       "metadata_key"),
+            ("fee_schedule_key",   "fee_schedule_key"),
+            ("pause_key",          "pause_key"),
             ("auto_renew_account", "autoRenewAccount"),
         ]:
-            val = getattr(self, attr)
-            if val:
-                getattr(proto, field).CopyFrom(val._to_proto())
+            self._copy_msg_to_proto(self, proto, src_attr, dst_field)
 
         if self.is_deleted is not None:
             proto.deleted = self.is_deleted