feat: fix up the tests

Author: nplasterer

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

@@ -91,10 +91,7 @@ class ClientTest {
         )
         val client =
             Client().create(account = fakeWallet, options = options)
-        assertEquals(
-            client.address.lowercase(),
-            client.libXMTPClient?.accountAddress()?.lowercase()
-        )
+        assert(client.canMessageV3(listOf(client.address)))
 
         val bundle = client.privateKeyBundle
         val clientFromV1Bundle = Client().buildFromBundle(bundle, account = fakeWallet, options = options)
@@ -103,9 +100,12 @@ class ClientTest {
             client.privateKeyBundleV1.identityKey,
             clientFromV1Bundle.privateKeyBundleV1.identityKey,
         )
+
+        assert(clientFromV1Bundle.canMessageV3(listOf(client.address)))
+
         assertEquals(
-            client.libXMTPClient?.accountAddress(),
-            clientFromV1Bundle.libXMTPClient?.accountAddress()
+            client.address,
+            clientFromV1Bundle.address
         )
     }
 
@@ -122,8 +122,7 @@ class ClientTest {
                     appContext = context
                 )
             )
-        val v3Client = client.libXMTPClient
-        assertEquals(client.address.lowercase(), v3Client?.accountAddress()?.lowercase())
+        assert(client.canMessageV3(listOf(client.address)))
     }
 
     @Test
@@ -139,16 +138,14 @@ class ClientTest {
                     appContext = context
                 )
             )
-        val v3Client = client.libXMTPClient
-        assertEquals(client.address.lowercase(), v3Client?.accountAddress()?.lowercase())
+        assert(client.canMessageV3(listOf(client.address)))
     }
 
     @Test
     fun testDoesNotCreateAV3Client() {
         val fakeWallet = PrivateKeyBuilder()
         val client = Client().create(account = fakeWallet)
-        val v3Client = client.libXMTPClient
-        assertNull(v3Client)
+        assert(!client.canMessageV3(listOf(client.address)))
     }
 
     @Test

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

@@ -241,22 +241,25 @@ class GroupTest {
     @Test
     fun testCanStreamGroupMessages() = kotlinx.coroutines.test.runTest {
         val group = boClient.conversations.newGroup(listOf(alix.walletAddress.lowercase()))
+        alixClient.conversations.syncGroups()
+        val alixGroup = alixClient.conversations.listGroups().first()
         group.streamMessages().test {
-            group.send("hi")
+            alixGroup.send("hi")
             assertEquals("hi", awaitItem().body)
-            group.send("hi again")
+            alixGroup.send("hi again")
             assertEquals("hi again", awaitItem().body)
         }
     }
 
     @Test
     fun testCanStreamDecryptedGroupMessages() = kotlinx.coroutines.test.runTest {
         val group = boClient.conversations.newGroup(listOf(alix.walletAddress))
-
+        alixClient.conversations.syncGroups()
+        val alixGroup = alixClient.conversations.listGroups().first()
         group.streamDecryptedMessages().test {
-            group.send("hi")
+            alixGroup.send("hi")
             assertEquals("hi", awaitItem().encodedContent.content.toStringUtf8())
-            group.send("hi again")
+            alixGroup.send("hi again")
             assertEquals("hi again", awaitItem().encodedContent.content.toStringUtf8())
         }
     }

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

@@ -578,11 +578,12 @@ class Client() {
         return runBlocking { query(Topic.contact(peerAddress)).envelopesList.size > 0 }
     }
 
-    fun canMessage(addresses: List<String>): Boolean {
-        return runBlocking {
-            libXMTPClient != null && !libXMTPClient!!.canMessage(addresses.map { it })
-                .contains(false)
+    fun canMessageV3(addresses: List<String>): Boolean {
+        if (libXMTPClient == null) return false
+        val statuses = runBlocking {
+            libXMTPClient!!.canMessage(addresses)
         }
+        return !statuses.contains(false)
     }
 
     val privateKeyBundle: PrivateKeyBundle

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

@@ -100,7 +100,7 @@ data class Conversations(
         ) {
             throw XMTPException("Recipient is sender")
         }
-        if (!client.canMessage(accountAddresses)) {
+        if (!client.canMessageV3(accountAddresses)) {
             throw XMTPException("Recipient not on network")
         }