From 67106e8a11039c3c702b4206f6f463a9bc42555b Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Sun, 16 Feb 2025 11:53:23 -0500 Subject: [PATCH] Renames PoW processor to parser --- .../{PoWRankParserTest.kt => PoWRankProcessorTest.kt} | 10 +++++----- .../vitorpamplona/quartz/nip01Core/tags/people/PTag.kt | 6 +++++- .../java/com/vitorpamplona/quartz/nip13Pow/EventExt.kt | 4 ++-- .../nip13Pow/{PoWRankParser.kt => PoWRankProcessor.kt} | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) rename quartz/src/androidTest/java/com/vitorpamplona/quartz/nip13Pow/{PoWRankParserTest.kt => PoWRankProcessorTest.kt} (74%) rename quartz/src/main/java/com/vitorpamplona/quartz/nip13Pow/{PoWRankParser.kt => PoWRankProcessor.kt} (98%) diff --git a/quartz/src/androidTest/java/com/vitorpamplona/quartz/nip13Pow/PoWRankParserTest.kt b/quartz/src/androidTest/java/com/vitorpamplona/quartz/nip13Pow/PoWRankProcessorTest.kt similarity index 74% rename from quartz/src/androidTest/java/com/vitorpamplona/quartz/nip13Pow/PoWRankParserTest.kt rename to quartz/src/androidTest/java/com/vitorpamplona/quartz/nip13Pow/PoWRankProcessorTest.kt index d999449ff..863a2c147 100644 --- a/quartz/src/androidTest/java/com/vitorpamplona/quartz/nip13Pow/PoWRankParserTest.kt +++ b/quartz/src/androidTest/java/com/vitorpamplona/quartz/nip13Pow/PoWRankProcessorTest.kt @@ -26,24 +26,24 @@ import org.junit.Test import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) -class PoWRankParserTest { +class PoWRankProcessorTest { @Test fun setPoW() { - assertEquals(26, PoWRankParser.calculatePowRankOf("00000026c91e9fc75fdb95b367776e2594b931cebda6d5ca3622501006669c9e")) + assertEquals(26, PoWRankProcessor.calculatePowRankOf("00000026c91e9fc75fdb95b367776e2594b931cebda6d5ca3622501006669c9e")) } @Test fun setPoWIfCommited25() { - assertEquals(25, PoWRankParser.compute("00000026c91e9fc75fdb95b367776e2594b931cebda6d5ca3622501006669c9e", 25)) + assertEquals(25, PoWRankProcessor.compute("00000026c91e9fc75fdb95b367776e2594b931cebda6d5ca3622501006669c9e", 25)) } @Test fun setPoWIfCommited26() { - assertEquals(26, PoWRankParser.compute("00000026c91e9fc75fdb95b367776e2594b931cebda6d5ca3622501006669c9e", 26)) + assertEquals(26, PoWRankProcessor.compute("00000026c91e9fc75fdb95b367776e2594b931cebda6d5ca3622501006669c9e", 26)) } @Test fun setPoWIfCommited27() { - assertEquals(26, PoWRankParser.compute("00000026c91e9fc75fdb95b367776e2594b931cebda6d5ca3622501006669c9e", 27)) + assertEquals(26, PoWRankProcessor.compute("00000026c91e9fc75fdb95b367776e2594b931cebda6d5ca3622501006669c9e", 27)) } } diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/people/PTag.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/people/PTag.kt index 3228a7b0a..acdbc6266 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/people/PTag.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/people/PTag.kt @@ -20,6 +20,7 @@ */ package com.vitorpamplona.quartz.nip01Core.tags.people +import android.util.Log import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Tag @@ -66,7 +67,10 @@ data class PTag( @JvmStatic fun parseKey(tag: Array): HexKey? { if (tag.isNotName(TAG_NAME, TAG_SIZE)) return null - if (tag[1].length != 64) return null + if (tag[1].length != 64) { + Log.w("PTag", "Invalid `$TAG_NAME` value ${tag.joinToString(", ")}") + return null + } return tag[1] } diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip13Pow/EventExt.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip13Pow/EventExt.kt index 7ad1062f7..a38053a73 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip13Pow/EventExt.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip13Pow/EventExt.kt @@ -22,7 +22,7 @@ package com.vitorpamplona.quartz.nip13Pow import com.vitorpamplona.quartz.nip01Core.core.Event -fun Event.pow() = PoWRankParser.compute(id, tags.commitedPoW()) +fun Event.pow() = PoWRankProcessor.compute(id, tags.commitedPoW()) fun Event.hasPoWTag() = tags.hasPoW() @@ -34,7 +34,7 @@ fun Event.hasPoWTag() = tags.hasPoW() fun Event.strongPoWOrNull(min: Int = 20): Int? { val commitment = tags.commitedPoW() if (commitment != null) { - val pow = PoWRankParser.compute(id, commitment) + val pow = PoWRankProcessor.compute(id, commitment) if (pow >= min) { return pow } diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip13Pow/PoWRankParser.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip13Pow/PoWRankProcessor.kt similarity index 98% rename from quartz/src/main/java/com/vitorpamplona/quartz/nip13Pow/PoWRankParser.kt rename to quartz/src/main/java/com/vitorpamplona/quartz/nip13Pow/PoWRankProcessor.kt index ae51bd962..f47e1c0b4 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip13Pow/PoWRankParser.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip13Pow/PoWRankProcessor.kt @@ -22,7 +22,7 @@ package com.vitorpamplona.quartz.nip13Pow import com.vitorpamplona.quartz.nip01Core.HexKey -class PoWRankParser { +class PoWRankProcessor { companion object { @JvmStatic fun compute(