address @t-bast comments

ACINQ · Dec 19, 2024 · 34c1acc · 34c1acc
1 parent 37b446a
commit 34c1acc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/modules/core/src/commonMain/kotlin/fr/acinq/lightning/serialization/payment/Serialization.kt b/modules/core/src/commonMain/kotlin/fr/acinq/lightning/serialization/payment/Serialization.kt
@@ -8,20 +8,12 @@ object Serialization {
         return fr.acinq.lightning.serialization.payment.v1.Serialization.serialize(payment)
     }
 
-    fun deserialize(bin: ByteArray): DeserializationResult {
-        return when (bin.firstOrNull()?.toInt()) {
-            1 -> DeserializationResult.Success(fr.acinq.lightning.serialization.payment.v1.Deserialization.deserialize(bin))
-            else -> DeserializationResult.UnknownVersion(bin[0].toInt())
-        }
-    }
-
-    sealed class DeserializationResult {
-        data class Success(val data: WalletPayment) : DeserializationResult()
-        data class UnknownVersion(val version: Int) : DeserializationResult()
-
-        fun get(): WalletPayment = when(this) {
-            is Success -> data
-            is UnknownVersion -> error("unknown version ${this.version}")
+    fun deserialize(bin: ByteArray): Result<WalletPayment> {
+        return runCatching {
+            when (val version = bin.first().toInt()) {
+                1 -> fr.acinq.lightning.serialization.payment.v1.Deserialization.deserialize(bin)
+                else -> error("unknown version $version")
+            }
         }
     }
 

diff --git a/...onTest/kotlin/fr/acinq/lightning/serialization/payment/PaymentSerializationTestsCommon.kt b/...onTest/kotlin/fr/acinq/lightning/serialization/payment/PaymentSerializationTestsCommon.kt
@@ -144,7 +144,7 @@ class PaymentSerializationTestsCommon {
         )
 
         payments.forEach {
-            assertEquals(it, Serialization.deserialize(Serialization.serialize(it)).get())
+            assertEquals(it, Serialization.deserialize(Serialization.serialize(it)).getOrThrow())
         }
     }
 }