Avoids using format to write hex-encoded strings.

This commit is contained in:
Vitor Pamplona
2026-03-15 11:03:50 -04:00
parent a21e38f428
commit 2c91fdea15
3 changed files with 11 additions and 9 deletions
@@ -213,6 +213,6 @@ object NostrConnectLoginUseCase {
private fun generateSecret(): String {
val bytes = ByteArray(32)
SecureRandom().nextBytes(bytes)
return bytes.joinToString("") { "%02x".format(it) }
return bytes.toHexKey()
}
}
@@ -21,6 +21,7 @@
package com.vitorpamplona.quartz.nip47WalletConnect
import com.vitorpamplona.quartz.nip01Core.core.HexKey
import com.vitorpamplona.quartz.nip01Core.core.toHexKey
import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
import kotlinx.coroutines.test.runTest
@@ -44,7 +45,7 @@ class LnZapPaymentRequestEventTest {
val walletKeyPair = KeyPair()
val clientSigner = NostrSignerInternal(clientKeyPair)
val walletServicePubkey: HexKey =
walletKeyPair.pubKey.joinToString("") { "%02x".format(it) }
walletKeyPair.pubKey.toHexKey()
val event =
LnZapPaymentRequestEvent.create(
@@ -68,7 +69,7 @@ class LnZapPaymentRequestEventTest {
val walletKeyPair = KeyPair()
val clientSigner = NostrSignerInternal(clientKeyPair)
val walletServicePubkey: HexKey =
walletKeyPair.pubKey.joinToString("") { "%02x".format(it) }
walletKeyPair.pubKey.toHexKey()
val request = GetBalanceMethod.create()
val event =
@@ -92,7 +93,7 @@ class LnZapPaymentRequestEventTest {
val walletKeyPair = KeyPair()
val clientSigner = NostrSignerInternal(clientKeyPair)
val walletServicePubkey: HexKey =
walletKeyPair.pubKey.joinToString("") { "%02x".format(it) }
walletKeyPair.pubKey.toHexKey()
val request = GetBalanceMethod.create()
val event =
@@ -116,7 +117,7 @@ class LnZapPaymentRequestEventTest {
val clientSigner = NostrSignerInternal(clientKeyPair)
val walletSigner = NostrSignerInternal(walletKeyPair)
val walletServicePubkey: HexKey =
walletKeyPair.pubKey.joinToString("") { "%02x".format(it) }
walletKeyPair.pubKey.toHexKey()
val event =
LnZapPaymentRequestEvent.create(
@@ -139,7 +140,7 @@ class LnZapPaymentRequestEventTest {
val clientSigner = NostrSignerInternal(clientKeyPair)
val walletSigner = NostrSignerInternal(walletKeyPair)
val walletServicePubkey: HexKey =
walletKeyPair.pubKey.joinToString("") { "%02x".format(it) }
walletKeyPair.pubKey.toHexKey()
val request = MakeInvoiceMethod.create(5000L, "test payment")
val event =
@@ -163,7 +164,7 @@ class LnZapPaymentRequestEventTest {
val clientSigner = NostrSignerInternal(clientKeyPair)
val walletSigner = NostrSignerInternal(walletKeyPair)
val walletServicePubkey: HexKey =
walletKeyPair.pubKey.joinToString("") { "%02x".format(it) }
walletKeyPair.pubKey.toHexKey()
val request = GetInfoMethod.create()
val event =
@@ -191,7 +192,7 @@ class LnZapPaymentRequestEventTest {
val walletSigner = NostrSignerInternal(walletKeyPair)
val otherSigner = NostrSignerInternal(otherKeyPair)
val walletServicePubkey: HexKey =
walletKeyPair.pubKey.joinToString("") { "%02x".format(it) }
walletKeyPair.pubKey.toHexKey()
val event =
LnZapPaymentRequestEvent.create(
@@ -20,6 +20,7 @@
*/
package com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin
import com.vitorpamplona.quartz.nip01Core.core.toHexKey
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
@@ -277,7 +278,7 @@ class ElectrumXClient(
*/
private fun electrumScriptHash(script: ByteArray): String {
val digest = MessageDigest.getInstance("SHA-256").digest(script)
return digest.reversedArray().joinToString("") { "%02x".format(it) }
return digest.reversedArray().toHexKey()
}
/**