Fix - handle missing fields in cross chain config (#1397)

novasamatech · Feb 19, 2024 · d17172b · d17172b
1 parent e20cdb1
commit d17172b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/...-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/mappers/CrossChain.kt b/...-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/mappers/CrossChain.kt
@@ -9,7 +9,6 @@ import io.novafoundation.nova.feature_wallet_api.domain.model.CrossChainTransfer
 import io.novafoundation.nova.feature_wallet_api.domain.model.CrossChainTransfersConfiguration.XcmFee
 import io.novafoundation.nova.feature_wallet_api.domain.model.CrossChainTransfersConfiguration.XcmTransfer
 import io.novafoundation.nova.feature_wallet_api.domain.model.DeliveryFeeConfiguration
-import io.novafoundation.nova.feature_wallet_api.domain.model.DeliveryFeeConfiguration.Type
 import io.novafoundation.nova.feature_wallet_api.domain.model.XCMInstructionType
 import io.novafoundation.nova.feature_wallet_api.domain.model.XcmTransferType
 import io.novafoundation.nova.feature_wallet_impl.data.network.crosschain.CrossChainOriginAssetRemote
@@ -27,27 +26,27 @@ import io.novafoundation.nova.runtime.multiNetwork.multiLocation.toInterior
 import java.math.BigInteger
 
 fun mapCrossChainConfigFromRemote(remote: CrossChainTransfersConfigRemote): CrossChainTransfersConfiguration {
-    val assetsLocations = remote.assetsLocation.mapValues { (_, reserveLocationRemote) ->
+    val assetsLocations = remote.assetsLocation.orEmpty().mapValues { (_, reserveLocationRemote) ->
         mapReserveLocationFromRemote(reserveLocationRemote)
     }
 
-    val feeInstructions = remote.instructions.mapValues { (_, instructionsRemote) ->
+    val feeInstructions = remote.instructions.orEmpty().mapValues { (_, instructionsRemote) ->
         instructionsRemote.map(::mapXcmInstructionFromRemote)
     }
 
-    val chains = remote.chains.associateBy(
+    val chains = remote.chains.orEmpty().associateBy(
         keySelector = { it.chainId },
         valueTransform = { it.assets.map(::mapAssetTransfersFromRemote) }
     )
 
-    val networkDeliveryFee = remote.networkDeliveryFee.mapValues { (_, networkDeliveryFeeRemote) ->
+    val networkDeliveryFee = remote.networkDeliveryFee.orEmpty().mapValues { (_, networkDeliveryFeeRemote) ->
         mapNetworkDeliveryFeeFromRemote(networkDeliveryFeeRemote)
     }
 
     return CrossChainTransfersConfiguration(
         assetLocations = assetsLocations,
         feeInstructions = feeInstructions,
-        instructionBaseWeights = remote.networkBaseWeight,
+        instructionBaseWeights = remote.networkBaseWeight.orEmpty(),
         deliveryFeeConfigurations = networkDeliveryFee,
         chains = chains
     )

diff --git a/...novafoundation/nova/feature_wallet_impl/data/network/crosschain/CrossChainConfigRemote.kt b/...novafoundation/nova/feature_wallet_impl/data/network/crosschain/CrossChainConfigRemote.kt
@@ -4,11 +4,11 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId
 import java.math.BigInteger
 
 class CrossChainTransfersConfigRemote(
-    val assetsLocation: Map<String, ReserveLocationRemote>,
-    val instructions: Map<String, List<String>>,
-    val networkDeliveryFee: Map<String, NetworkDeliveryFeeRemote>,
-    val networkBaseWeight: Map<String, BigInteger>,
-    val chains: List<CrossChainOriginChainRemote>
+    val assetsLocation: Map<String, ReserveLocationRemote>?,
+    val instructions: Map<String, List<String>>?,
+    val networkDeliveryFee: Map<String, NetworkDeliveryFeeRemote>?,
+    val networkBaseWeight: Map<String, BigInteger>?,
+    val chains: List<CrossChainOriginChainRemote>?
 )
 
 class ReserveLocationRemote(