Foundations(iOS Sourceset): Linter fixes for EventHasherSerializer and Secp256k1Instance.

quartz/src/iosMain/kotlin/com/vitorpamplona/quartz/nip01Core/crypto/EventHasherSerializer.ios.kt

@@ -30,7 +30,6 @@ import kotlinx.serialization.json.addJsonArray
 import kotlinx.serialization.json.buildJsonArray
 
 actual object EventHasherSerializer {
-
     fun makeJsonObjectForId(
         pubKey: HexKey,
         createdAt: Long,
@@ -38,30 +37,30 @@ actual object EventHasherSerializer {
         tags: Array<Array<String>>,
         content: String,
     ): JsonArray {
-        val arrayBuilder = buildJsonArray {
+        val arrayBuilder =
-            add(0)
+            buildJsonArray {
-            add(pubKey)
+                add(0)
-            add(createdAt)
+                add(pubKey)
-            add(kind)
+                add(createdAt)
-            addJsonArray {
+                add(kind)
-                tags.fastForEach { tag ->
+                addJsonArray {
-                    //add(JsonArray(content = tag.map { JsonPrimitive(it) }))
+                    tags.fastForEach { tag ->
-                    addJsonArray { tag.fastForEach { add(it) } }
+                        // add(JsonArray(content = tag.map { JsonPrimitive(it) }))
+                        addJsonArray { tag.fastForEach { add(it) } }
+                    }
                 }
+                add(content)
             }
-            add(content)
-        }
         return arrayBuilder
     }
+
     actual fun makeJsonForId(
         pubKey: HexKey,
         createdAt: Long,
         kind: Int,
         tags: Array<Array<String>>,
         content: String,
-    ): String {
+    ): String = makeJsonObjectForId(pubKey, createdAt, kind, tags, content).toString()
-        return makeJsonObjectForId(pubKey, createdAt, kind, tags,content).toString()
-    }
 
     actual fun fastMakeJsonForId(
         pubKey: HexKey,
@@ -71,7 +70,7 @@ actual object EventHasherSerializer {
         content: String,
     ): ByteArray {
         // Also use makeJsonObjectForId(...) above. May change this if needed(for performance).
-        return makeJsonObjectForId(pubKey, createdAt, kind, tags,content).toString().encodeToByteArray()
+        return makeJsonObjectForId(pubKey, createdAt, kind, tags, content).toString().encodeToByteArray()
     }
 
     actual fun makeJsonForIdHashAndCheck(
@@ -82,7 +81,6 @@ actual object EventHasherSerializer {
         tags: Array<Array<String>>,
         content: String,
     ): Boolean {
-
         // Also use makeJsonObjectForId(...) above. May change byteArray encode method if needed.
         val eventIdHash = sha256(makeJsonObjectForId(pubKey, createdAt, kind, tags, content).toString().encodeToByteArray())
         return Hex.isEqual(id, eventIdHash)

quartz/src/iosMain/kotlin/com/vitorpamplona/quartz/utils/Secp256k1Instance.ios.kt

@@ -23,17 +23,12 @@ package com.vitorpamplona.quartz.utils
 import fr.acinq.secp256k1.Secp256k1
 
 actual object Secp256k1Instance {
-
     private val h02 = Hex.decode("02")
     private val secp256k1Ref = Secp256k1.get()
 
-    actual fun compressedPubKeyFor(privKey: ByteArray): ByteArray {
+    actual fun compressedPubKeyFor(privKey: ByteArray): ByteArray = secp256k1Ref.pubKeyCompress(secp256k1Ref.pubkeyCreate(privKey))
-        return secp256k1Ref.pubKeyCompress(secp256k1Ref.pubkeyCreate(privKey))
-    }
 
-    actual fun isPrivateKeyValid(il: ByteArray): Boolean {
+    actual fun isPrivateKeyValid(il: ByteArray): Boolean = secp256k1Ref.secKeyVerify(il)
-        return secp256k1Ref.secKeyVerify(il)
-    }
 
     actual fun signSchnorr(
         data: ByteArray,