From 5db9384e7fd5ce8a04c0057c8d55e88a37775762 Mon Sep 17 00:00:00 2001 From: KotlinGeekDev Date: Mon, 29 Dec 2025 19:01:22 +0100 Subject: [PATCH] Foundations(iOS Sourceset): Linter fixes for EventHasherSerializer and Secp256k1Instance. --- .../crypto/EventHasherSerializer.ios.kt | 32 +++++++++---------- .../quartz/utils/Secp256k1Instance.ios.kt | 9 ++---- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/quartz/src/iosMain/kotlin/com/vitorpamplona/quartz/nip01Core/crypto/EventHasherSerializer.ios.kt b/quartz/src/iosMain/kotlin/com/vitorpamplona/quartz/nip01Core/crypto/EventHasherSerializer.ios.kt index 85e5f2184..e685c3812 100644 --- a/quartz/src/iosMain/kotlin/com/vitorpamplona/quartz/nip01Core/crypto/EventHasherSerializer.ios.kt +++ b/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>, content: String, ): JsonArray { - val arrayBuilder = buildJsonArray { - add(0) - add(pubKey) - add(createdAt) - add(kind) - addJsonArray { - tags.fastForEach { tag -> - //add(JsonArray(content = tag.map { JsonPrimitive(it) })) - addJsonArray { tag.fastForEach { add(it) } } + val arrayBuilder = + buildJsonArray { + add(0) + add(pubKey) + add(createdAt) + add(kind) + addJsonArray { + tags.fastForEach { tag -> + // 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>, content: String, - ): String { - return makeJsonObjectForId(pubKey, createdAt, kind, tags,content).toString() - } + ): String = 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>, 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) diff --git a/quartz/src/iosMain/kotlin/com/vitorpamplona/quartz/utils/Secp256k1Instance.ios.kt b/quartz/src/iosMain/kotlin/com/vitorpamplona/quartz/utils/Secp256k1Instance.ios.kt index d098cac0f..a53914df1 100644 --- a/quartz/src/iosMain/kotlin/com/vitorpamplona/quartz/utils/Secp256k1Instance.ios.kt +++ b/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 { - return secp256k1Ref.pubKeyCompress(secp256k1Ref.pubkeyCreate(privKey)) - } + actual fun compressedPubKeyFor(privKey: ByteArray): ByteArray = secp256k1Ref.pubKeyCompress(secp256k1Ref.pubkeyCreate(privKey)) - actual fun isPrivateKeyValid(il: ByteArray): Boolean { - return secp256k1Ref.secKeyVerify(il) - } + actual fun isPrivateKeyValid(il: ByteArray): Boolean = secp256k1Ref.secKeyVerify(il) actual fun signSchnorr( data: ByteArray,