fix: fixes group consent tests, typo and ordering

Author: tuddman

library/src/androidTest/java/org/xmtp/android/library/ContactsTest.kt

@@ -12,8 +12,8 @@ class ContactsTest {
     fun testNormalizesAddresses() {
         val fixtures = fixtures()
         fixtures.bobClient.ensureUserContactPublished()
-        val bobAddressLowercased = fixtures.bobClient.address?.lowercase()
-        val bobContact = fixtures.aliceClient.getUserContact(peerAddress = bobAddressLowercased!!)
+        val bobAddressLowerCased = fixtures.bobClient.address.lowercase()
+        val bobContact = fixtures.aliceClient.getUserContact(peerAddress = bobAddressLowerCased)
         assert(bobContact != null)
     }
 
@@ -67,34 +67,4 @@ class ContactsTest {
         result = contacts.isDenied(fixtures.alice.walletAddress)
         assert(result)
     }
-    
-    @Test
-    fun testAllowGroup() {
-        val groupFixtures = groupFixtures()
-
-        val groups = groupFixtures.bobClient.groups
-        var result = contacts.isGroupAllowed(groupFixtures.<GROUP_ID_HERE>)
-
-        assert(!result)
-
-        contacts.allowGroup(listOf(groupFixtures.<GROUP_ID_HERE>))
-
-        result = contacts.isGroupAllowed(groupFixtures.<GROUP_ID_HERE>)
-        assert(result)
-    }
-
-    @Test
-    fun testDenyGroup() {
-        val groupFixtures = groupFixtures()
-
-        val groups = groupFixtures.bobClient.groups
-        var result = contacts.isGroupAllowed(groupFixtures.<GROUP_ID_HERE>)
-
-        assert(!result)
-
-        contacts.denyGroup(listOf(groupFixtures.<GROUP_ID_HERE>))
-
-        result = contacts.isGroupDenied(groupFixtures.<GROUP_ID_HERE>)
-        assert(result)
-    }
 }

library/src/androidTest/java/org/xmtp/android/library/GroupTest.kt

@@ -20,17 +20,17 @@ import org.xmtp.android.library.messages.walletAddress
 
 @RunWith(AndroidJUnit4::class)
 class GroupTest {
-    lateinit var fakeApiClient: FakeApiClient
-    lateinit var alixWallet: PrivateKeyBuilder
-    lateinit var boWallet: PrivateKeyBuilder
-    lateinit var alix: PrivateKey
-    lateinit var alixClient: Client
-    lateinit var bo: PrivateKey
-    lateinit var boClient: Client
-    lateinit var caroWallet: PrivateKeyBuilder
-    lateinit var caro: PrivateKey
-    lateinit var caroClient: Client
-    lateinit var fixtures: Fixtures
+    private lateinit var fakeApiClient: FakeApiClient
+    private lateinit var alixWallet: PrivateKeyBuilder
+    private lateinit var boWallet: PrivateKeyBuilder
+    private lateinit var alix: PrivateKey
+    private lateinit var alixClient: Client
+    private lateinit var bo: PrivateKey
+    private lateinit var boClient: Client
+    private lateinit var caroWallet: PrivateKeyBuilder
+    private lateinit var caro: PrivateKey
+    private lateinit var caroClient: Client
+    private lateinit var fixtures: Fixtures
 
     @Before
     fun setUp() {
@@ -150,7 +150,7 @@ class GroupTest {
 
     @Test
     fun testCannotSendMessageToGroupMemberNotOnV3() {
-        var fakeApiClient = FakeApiClient()
+        val fakeApiClient = FakeApiClient()
         val chuxAccount = PrivateKeyBuilder()
         val chux: PrivateKey = chuxAccount.getPrivateKey()
         val chuxClient: Client = Client().create(account = chuxAccount, apiClient = fakeApiClient)
@@ -264,4 +264,41 @@ class GroupTest {
             assertEquals(conversation.topic, awaitItem().topic)
         }
     }
+
+    @Test
+    fun testCanAllowGroup() {
+        val group = boClient.conversations.newGroup(
+            listOf(
+                alix.walletAddress,
+                caro.walletAddress
+            )
+        )
+
+        var result = boClient.contacts.isGroupAllowed(group.id)
+
+        assert(!result)
+
+        boClient.contacts.allowGroup(listOf(group.id))
+
+        result = boClient.contacts.isGroupAllowed(group.id)
+        assert(result)
+    }
+
+    @Test
+    fun testCanDenyGroup() {
+        val group = boClient.conversations.newGroup(
+            listOf(
+                alix.walletAddress,
+                caro.walletAddress
+            )
+        )
+        var result = boClient.contacts.isGroupAllowed(group.id)
+
+        assert(!result)
+
+        boClient.contacts.denyGroup(listOf(group.id))
+
+        result = boClient.contacts.isGroupDenied(group.id)
+        assert(result)
+    }
 }

library/src/main/java/org/xmtp/android/library/Contacts.kt

@@ -1,6 +1,5 @@
 package org.xmtp.android.library
 
-import com.google.protobuf.ByteString
 import com.google.protobuf.kotlin.toByteStringUtf8
 import kotlinx.coroutines.runBlocking
 import org.xmtp.android.library.messages.ContactBundle
@@ -11,7 +10,6 @@ import org.xmtp.android.library.messages.Topic
 import org.xmtp.android.library.messages.walletAddress
 import org.xmtp.proto.message.api.v1.MessageApiOuterClass
 import org.xmtp.proto.message.contents.PrivatePreferences.PrivatePreferencesAction
-import java.security.KeyStore.Entry
 import java.util.Date
 
 enum class ConsentState {
@@ -203,14 +201,6 @@ data class Contacts(
         return consentList
     }
 
-    fun isAllowed(address: String): Boolean {
-        return consentList.state(address) == ConsentState.ALLOWED
-    }
-
-    fun isDenied(address: String): Boolean {
-        return consentList.state(address) == ConsentState.DENIED
-    }
-
     fun allow(addresses: List<String>) {
         for (address in addresses) {
             ConsentList(client).publish(consentList.allow(address))
@@ -223,14 +213,6 @@ data class Contacts(
         }
     }
 
-    fun isGroupAllowed(groupId: ByteArray): Boolean {
-        return consentList.groupState(groupId) == ConsentState.ALLOWED
-    }
-
-    fun isGroupDenied(groupId: ByteArray): Boolean {
-        return consentList.groupState(groupId) == ConsentState.DENIED
-    }
-
     fun allowGroup(groupIds: List<ByteArray>) {
         for (id in groupIds) {
             ConsentList(client).publish(consentList.allowGroup(id))
@@ -243,6 +225,22 @@ data class Contacts(
         }
     }
 
+    fun isAllowed(address: String): Boolean {
+        return consentList.state(address) == ConsentState.ALLOWED
+    }
+
+    fun isDenied(address: String): Boolean {
+        return consentList.state(address) == ConsentState.DENIED
+    }
+
+    fun isGroupAllowed(groupId: ByteArray): Boolean {
+        return consentList.groupState(groupId) == ConsentState.ALLOWED
+    }
+
+    fun isGroupDenied(groupId: ByteArray): Boolean {
+        return consentList.groupState(groupId) == ConsentState.DENIED
+    }
+
     fun has(peerAddress: String): Boolean =
         knownBundles[peerAddress] != null
 

library/src/main/java/org/xmtp/android/library/Conversation.kt

@@ -214,7 +214,7 @@ sealed class Conversation {
             return client.address
         }
 
-    // Is the topic of the conversation depending of the version
+    // Is the topic of the conversation depending on the version
     val topic: String
         get() {
             return when (this) {

library/src/test/java/org/xmtp/android/library/TestHelpers.kt

@@ -43,13 +43,11 @@ class FakeWallet : SigningKey {
     }
 
     override suspend fun sign(data: ByteArray): Signature {
-        val signature = privateKeyBuilder.sign(data)
-        return signature
+        return privateKeyBuilder.sign(data)
     }
 
     override suspend fun sign(message: String): Signature {
-        val signature = privateKeyBuilder.sign(message)
-        return signature
+        return privateKeyBuilder.sign(message)
     }
 
     override val address: String
@@ -66,8 +64,8 @@ class FakeApiClient : ApiClient {
     override val environment: XMTPEnvironment = XMTPEnvironment.LOCAL
     private var authToken: String? = null
     private val responses: MutableMap<String, List<Envelope>> = mutableMapOf()
-    val published: MutableList<Envelope> = mutableListOf()
-    var forbiddingQueries = false
+    private val published: MutableList<Envelope> = mutableListOf()
+    private var forbiddingQueries = false
     private var stream = FakeStreamHolder()
 
     fun assertNoPublish(callback: () -> Unit) {
@@ -233,24 +231,4 @@ data class Fixtures(val aliceAccount: PrivateKeyBuilder, val bobAccount: Private
 }
 
 fun fixtures(): Fixtures =
-    Fixtures()
-
-data class GroupFixtures()  {
-    var fakeApiClient: FakeApiClient = FakeApiClient()
-    var alice: PrivateKey = aliceAccount.getPrivateKey()
-    var aliceClient: Client = Client().create(account = aliceAccount, apiClient = fakeApiClient)
-    var bob: PrivateKey = bobAccount.getPrivateKey()
-    var bobClient: Client = Client().create(account = bobAccount, apiClient = fakeApiClient)
-    var charlie: PrivateKey = bobAccount.getPrivateKey()
-    var charlieClient: Client = Client().create(account = charlieAccount, apiClient = fakeApiClient)
-
-    constructor() : this(aliceAccount = PrivateKeyBuilder(), bobAccount = PrivateKeyBuilder(), charlieAccount = PrivateKeyBuilder())
-
-    // TODO: Insert necessary group creation/publish functions
-  
-}
-
-fun groupFixtures(): GroupFixtures =
-    GroupFixtures()
-
-
+    Fixtures()