Clean up output data structure (#806)

Author: ruixhuang

src/commonMain/kotlin/exchange.dydx.abacus/calculator/MarginCalculator.kt

@@ -406,20 +406,6 @@ internal object MarginCalculator {
         return iListOf(subaccountNumber)
     }
 
-    fun getChangedSubaccountNumbersDeprecated(
-        parser: ParserProtocol,
-        account: Map<String, Any>?,
-        subaccountNumber: Int,
-        tradeInput: Map<String, Any>?
-    ): IList<Int> {
-        val childSubaccountNumber = getChildSubaccountNumberForIsolatedMarginTradeDeprecated(parser, account, subaccountNumber, tradeInput)
-        if (childSubaccountNumber != null && subaccountNumber != childSubaccountNumber) {
-            return iListOf(subaccountNumber, childSubaccountNumber)
-        }
-
-        return iListOf(subaccountNumber)
-    }
-
     fun getChildSubaccountNumberForIsolatedMarginClosePosition(
         account: InternalAccountState?,
         subaccountNumber: Int,
@@ -430,17 +416,6 @@ internal object MarginCalculator {
         return position?.subaccountNumber ?: subaccountNumber
     }
 
-    fun getChildSubaccountNumberForIsolatedMarginClosePositionDeprecated(
-        parser: ParserProtocol,
-        account: Map<String, Any>?,
-        subaccountNumber: Int,
-        tradeInput: Map<String, Any>?
-    ): Int {
-        val marketId = parser.asString(tradeInput?.get("marketId")) ?: return subaccountNumber
-        val position = findExistingPositionDeprecated(parser, account, marketId, subaccountNumber)
-        return parser.asInt(position?.get("subaccountNumber")) ?: subaccountNumber
-    }
-
     /**
      * @description Calculate the amount of collateral to transfer into child subaccount for an isolated margin trade.
      */

src/commonMain/kotlin/exchange.dydx.abacus/output/Asset.kt

@@ -1,9 +1,6 @@
 package exchange.dydx.abacus.output
 
-import exchange.dydx.abacus.protocols.LocalizerProtocol
-import exchange.dydx.abacus.protocols.ParserProtocol
 import exchange.dydx.abacus.utils.IList
-import exchange.dydx.abacus.utils.Logger
 import kollections.JsExport
 import kotlinx.serialization.Serializable
 
@@ -18,51 +15,7 @@ data class AssetResources(
     val secondaryDescription: String?,
     val primaryDescriptionKey: String?,
     val secondaryDescriptionKey: String?
-) {
-    companion object {
-        internal fun create(
-            existing: AssetResources?,
-            parser: ParserProtocol,
-            data: Map<*, *>?,
-            localizer: LocalizerProtocol?,
-        ): AssetResources? {
-            data?.let {
-                val websiteLink = parser.asString(data["websiteLink"])
-                val whitepaperLink = parser.asString(data["whitepaperLink"])
-                val coinMarketCapsLink = parser.asString(data["coinMarketCapsLink"])
-                val imageUrl = parser.asString(data["imageUrl"])
-                val primaryDescriptionKey = parser.asString(data["primaryDescriptionKey"])
-                val secondaryDescriptionKey = parser.asString(data["secondaryDescriptionKey"])
-                return if (existing?.websiteLink != websiteLink ||
-                    existing?.whitepaperLink != whitepaperLink ||
-                    existing?.coinMarketCapsLink != coinMarketCapsLink ||
-                    existing?.imageUrl != imageUrl ||
-                    existing?.primaryDescriptionKey != primaryDescriptionKey ||
-                    existing?.secondaryDescriptionKey != secondaryDescriptionKey
-                ) {
-                    val primaryDescription =
-                        if (primaryDescriptionKey != null) localizer?.localize(primaryDescriptionKey) else null
-                    val secondaryDescription =
-                        if (secondaryDescriptionKey != null) localizer?.localize(secondaryDescriptionKey) else null
-                    AssetResources(
-                        websiteLink,
-                        whitepaperLink,
-                        coinMarketCapsLink,
-                        imageUrl,
-                        primaryDescription,
-                        secondaryDescription,
-                        primaryDescriptionKey,
-                        secondaryDescriptionKey,
-                    )
-                } else {
-                    existing
-                }
-            }
-            Logger.d { "Asset Resources not valid" }
-            return null
-        }
-    }
-}
+)
 
 @JsExport
 @Serializable
@@ -72,42 +25,6 @@ data class Asset(
     val tags: IList<String>?,
     val resources: AssetResources?
 ) {
-    companion object {
-        internal fun create(
-            existing: Asset?,
-            parser: ParserProtocol,
-            data: Map<*, *>?,
-            localizer: LocalizerProtocol?,
-        ): Asset? {
-            data?.let {
-                val id = parser.asString(data["id"])
-                val resourcesData = parser.asMap(data["resources"])
-                if (id != null) {
-                    val resources = AssetResources.create(
-                        existing?.resources,
-                        parser,
-                        resourcesData,
-                        localizer,
-                    )
-                    val name = parser.asString(data["name"])
-                    val tags = parser.asStrings(data["tags"])
-
-                    return if (existing?.id != id ||
-                        existing.name != name ||
-                        existing.tags != tags ||
-                        existing.resources !== resources
-                    ) {
-                        Asset(id, name, tags, resources)
-                    } else {
-                        existing
-                    }
-                }
-            }
-            Logger.d { "Asset not valid" }
-            return null
-        }
-    }
-
     val displayableAssetId: String get() {
         return id.split(",").firstOrNull() ?: ""
     }