Support for NIP24- Trustless GiftWrapped Sealed Private Direct Messages and Small Private Groups

app/src/androidTest/java/com/vitorpamplona/amethyst/ChatroomKeyTest.kt

@@ -0,0 +1,20 @@
+package com.vitorpamplona.amethyst
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.amethyst.model.ChatroomKey
+import kotlinx.collections.immutable.persistentSetOf
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ChatroomKeyTest {
+    @Test
+    fun testEquals() {
+        val k1 = ChatroomKey(persistentSetOf("Key1", "Key2"))
+        val k2 = ChatroomKey(persistentSetOf("Key1", "Key2"))
+
+        assertEquals(k1, k2)
+        assertEquals(k1.hashCode(), k2.hashCode())
+    }
+}

app/src/androidTest/java/com/vitorpamplona/amethyst/CryptoUtilsTest.kt

@@ -59,6 +59,19 @@ class CryptoUtilsTest {
         assertEquals(msg, decrypted)
     }
 
+    @Test
+    fun encryptDecryptNIP4WithJsonSchemaTest() {
+        val msg = "Hi"
+
+        val privateKey = CryptoUtils.privkeyCreate()
+        val publicKey = CryptoUtils.pubkeyCreate(privateKey)
+
+        val encrypted = CryptoUtils.encryptNIP04Json(msg, privateKey, publicKey)
+        val decrypted = CryptoUtils.decryptNIP04(encrypted, privateKey, publicKey)
+
+        assertEquals(msg, decrypted)
+    }
+
     @Test
     fun encryptDecryptNIP24Test() {
         val msg = "Hi"
@@ -78,10 +91,9 @@ class CryptoUtilsTest {
 
         val privateKey = CryptoUtils.privkeyCreate()
         val publicKey = CryptoUtils.pubkeyCreate(privateKey)
-        val sharedSecret = CryptoUtils.getSharedSecretNIP04(privateKey, publicKey)
 
-        val encrypted = CryptoUtils.encryptNIP04(msg, sharedSecret)
-        val decrypted = CryptoUtils.decryptNIP04(encrypted, sharedSecret)
+        val encrypted = CryptoUtils.encryptNIP04(msg, privateKey, publicKey)
+        val decrypted = CryptoUtils.decryptNIP04(encrypted, privateKey, publicKey)
 
         assertEquals(msg, decrypted)
     }