From 103210ade4ba810bc5f75b302d790928bf10f586 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Mon, 13 Jan 2025 10:44:15 -0500
Subject: [PATCH] Moves pow test to pow package

---
 .../quartz/{encoders => nip13Pow}/PoWRankTest.kt              | 3 +--
 .../quartz/{nip19Bech32Entities => nip19Bech32}/ATagExt.kt    | 0
 .../{nip19Bech32Entities => nip19Bech32}/ByteArrayExt.kt      | 0
 .../quartz/{nip19Bech32Entities => nip19Bech32}/EventExt.kt   | 0
 .../{nip19Bech32Entities => nip19Bech32}/Nip19Parser.kt       | 4 ++--
 .../{nip19Bech32Entities => nip19Bech32}/TlvBuilderExt.kt     | 0
 .../quartz/{nip19Bech32Entities => nip19Bech32}/TlvTypes.kt   | 0
 .../{nip19Bech32Entities => nip19Bech32}/bech32/Bech32Util.kt | 0
 .../{nip19Bech32Entities => nip19Bech32}/entities/Entity.kt   | 0
 .../{nip19Bech32Entities => nip19Bech32}/entities/NAddress.kt | 0
 .../{nip19Bech32Entities => nip19Bech32}/entities/NEmbed.kt   | 0
 .../{nip19Bech32Entities => nip19Bech32}/entities/NEvent.kt   | 0
 .../{nip19Bech32Entities => nip19Bech32}/entities/NProfile.kt | 0
 .../{nip19Bech32Entities => nip19Bech32}/entities/NPub.kt     | 0
 .../{nip19Bech32Entities => nip19Bech32}/entities/NRelay.kt   | 0
 .../{nip19Bech32Entities => nip19Bech32}/entities/NSec.kt     | 0
 .../{nip19Bech32Entities => nip19Bech32}/entities/Note.kt     | 0
 .../quartz/{nip19Bech32Entities => nip19Bech32}/tlv/Tlv.kt    | 0
 .../{nip19Bech32Entities => nip19Bech32}/tlv/TlvBuilder.kt    | 0
 .../{nip19Bech32Entities => nip19Bech32}/NIP19ParserTest.kt   | 0
 .../{nip19Bech32Entities => nip19Bech32}/TlvIntegerTest.kt    | 0
 21 files changed, 3 insertions(+), 4 deletions(-)
 rename quartz/src/androidTest/java/com/vitorpamplona/quartz/{encoders => nip13Pow}/PoWRankTest.kt (95%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/ATagExt.kt (100%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/ByteArrayExt.kt (100%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/EventExt.kt (100%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/Nip19Parser.kt (98%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/TlvBuilderExt.kt (100%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/TlvTypes.kt (100%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/bech32/Bech32Util.kt (100%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/entities/Entity.kt (100%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/entities/NAddress.kt (100%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/entities/NEmbed.kt (100%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/entities/NEvent.kt (100%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/entities/NProfile.kt (100%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/entities/NPub.kt (100%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/entities/NRelay.kt (100%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/entities/NSec.kt (100%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/entities/Note.kt (100%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/tlv/Tlv.kt (100%)
 rename quartz/src/main/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/tlv/TlvBuilder.kt (100%)
 rename quartz/src/test/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/NIP19ParserTest.kt (100%)
 rename quartz/src/test/java/com/vitorpamplona/quartz/{nip19Bech32Entities => nip19Bech32}/TlvIntegerTest.kt (100%)

diff --git a/quartz/src/androidTest/java/com/vitorpamplona/quartz/encoders/PoWRankTest.kt b/quartz/src/androidTest/java/com/vitorpamplona/quartz/nip13Pow/PoWRankTest.kt
similarity index 95%
rename from quartz/src/androidTest/java/com/vitorpamplona/quartz/encoders/PoWRankTest.kt
rename to quartz/src/androidTest/java/com/vitorpamplona/quartz/nip13Pow/PoWRankTest.kt
index 79a60ac7d..8ca049981 100644
--- a/quartz/src/androidTest/java/com/vitorpamplona/quartz/encoders/PoWRankTest.kt
+++ b/quartz/src/androidTest/java/com/vitorpamplona/quartz/nip13Pow/PoWRankTest.kt
@@ -18,10 +18,9 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.vitorpamplona.quartz.encoders
+package com.vitorpamplona.quartz.nip13Pow
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.vitorpamplona.quartz.nip13Pow.PoWRank
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/ATagExt.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/ATagExt.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/ATagExt.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/ATagExt.kt
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/ByteArrayExt.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/ByteArrayExt.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/ByteArrayExt.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/ByteArrayExt.kt
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/EventExt.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/EventExt.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/EventExt.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/EventExt.kt
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/Nip19Parser.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/Nip19Parser.kt
similarity index 98%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/Nip19Parser.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/Nip19Parser.kt
index c6dd4935c..3e94e42e2 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/Nip19Parser.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/Nip19Parser.kt
@@ -41,13 +41,13 @@ import kotlinx.coroutines.CancellationException
 import java.util.regex.Pattern
 
 object Nip19Parser {
-    val nip19PlusNip46regex =
+    private val nip19PlusNip46regex: Pattern =
         Pattern.compile(
             "(nostr:)?@?(nsec1|npub1|nevent1|naddr1|note1|nprofile1|nrelay1|nembed1|ncryptsec1)([qpzry9x8gf2tvdw0s3jn54khce6mua7l]+)([\\S]*)",
             Pattern.CASE_INSENSITIVE,
         )
 
-    val nip19regex =
+    val nip19regex: Pattern =
         Pattern.compile(
             "(nostr:)?@?(nsec1|npub1|nevent1|naddr1|note1|nprofile1|nrelay1|nembed1)([qpzry9x8gf2tvdw0s3jn54khce6mua7l]+)([\\S]*)",
             Pattern.CASE_INSENSITIVE,
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/TlvBuilderExt.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/TlvBuilderExt.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/TlvBuilderExt.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/TlvBuilderExt.kt
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/TlvTypes.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/TlvTypes.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/TlvTypes.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/TlvTypes.kt
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/bech32/Bech32Util.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/bech32/Bech32Util.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/bech32/Bech32Util.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/bech32/Bech32Util.kt
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/Entity.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/Entity.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/Entity.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/Entity.kt
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/NAddress.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NAddress.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/NAddress.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NAddress.kt
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/NEmbed.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NEmbed.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/NEmbed.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NEmbed.kt
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/NEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NEvent.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/NEvent.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NEvent.kt
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/NProfile.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NProfile.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/NProfile.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NProfile.kt
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/NPub.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NPub.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/NPub.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NPub.kt
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/NRelay.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NRelay.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/NRelay.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NRelay.kt
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/NSec.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NSec.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/NSec.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NSec.kt
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/Note.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/Note.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/entities/Note.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/Note.kt
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/tlv/Tlv.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/tlv/Tlv.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/tlv/Tlv.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/tlv/Tlv.kt
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/tlv/TlvBuilder.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/tlv/TlvBuilder.kt
similarity index 100%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32Entities/tlv/TlvBuilder.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/tlv/TlvBuilder.kt
diff --git a/quartz/src/test/java/com/vitorpamplona/quartz/nip19Bech32Entities/NIP19ParserTest.kt b/quartz/src/test/java/com/vitorpamplona/quartz/nip19Bech32/NIP19ParserTest.kt
similarity index 100%
rename from quartz/src/test/java/com/vitorpamplona/quartz/nip19Bech32Entities/NIP19ParserTest.kt
rename to quartz/src/test/java/com/vitorpamplona/quartz/nip19Bech32/NIP19ParserTest.kt
diff --git a/quartz/src/test/java/com/vitorpamplona/quartz/nip19Bech32Entities/TlvIntegerTest.kt b/quartz/src/test/java/com/vitorpamplona/quartz/nip19Bech32/TlvIntegerTest.kt
similarity index 100%
rename from quartz/src/test/java/com/vitorpamplona/quartz/nip19Bech32Entities/TlvIntegerTest.kt
rename to quartz/src/test/java/com/vitorpamplona/quartz/nip19Bech32/TlvIntegerTest.kt