More Streaming and Threading Improvements (#192)

* bump the binaries

* add v2 rust client to the client creation methods

* make all send functions suspend

* fix up the tests to not lock on send

* Revert "make all send functions suspend"

This reverts commit e4152d8.

* Revert "Revert "make all send functions suspend""

This reverts commit 125d1ac.

* fix lots of the threading issues

* fix up the linter errors

* bump to the latest rust library

* make delay longer

* clean up url usuage

* bump to latest rust

* incrementally making suspend functions better

* remove the fake api client

* use subscribe2

* remove rust v2 and the subscribe

* remove subscribe entirely

* make more suspend

* bring back conversation tests

* fix up the linter and some more tests

* fix up the tests

* get all the tests passing

* everything takes a subscribe2 now

* clean up the subscribe2 under the hood

Author: nplasterer

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

@@ -25,8 +25,9 @@ class AttachmentTest {
 
         val fixtures = fixtures()
         val aliceClient = fixtures.aliceClient
-        val aliceConversation =
+        val aliceConversation = runBlocking {
             aliceClient.conversations.newConversation(fixtures.bob.walletAddress)
+        }
 
         runBlocking {
             aliceConversation.send(

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

@@ -26,8 +26,8 @@ class ClientTest {
     fun testHasPrivateKeyBundleV1() {
         val fakeWallet = PrivateKeyBuilder()
         val client = Client().create(account = fakeWallet)
-        assertEquals(1, client.privateKeyBundleV1?.preKeysList?.size)
-        val preKey = client.privateKeyBundleV1?.preKeysList?.get(0)
+        assertEquals(1, client.privateKeyBundleV1.preKeysList?.size)
+        val preKey = client.privateKeyBundleV1.preKeysList?.get(0)
         assert(preKey?.publicKey?.hasSignature() ?: false)
     }
 
@@ -50,15 +50,15 @@ class ClientTest {
         val fakeWallet = PrivateKeyBuilder()
         val client = Client().create(account = fakeWallet)
         val bundle = client.privateKeyBundle
-        val clientFromV1Bundle = Client().buildFromBundle(bundle!!)
+        val clientFromV1Bundle = Client().buildFromBundle(bundle)
         assertEquals(client.address, clientFromV1Bundle.address)
         assertEquals(
-            client.privateKeyBundleV1?.identityKey,
-            clientFromV1Bundle.privateKeyBundleV1?.identityKey,
+            client.privateKeyBundleV1.identityKey,
+            clientFromV1Bundle.privateKeyBundleV1.identityKey,
         )
         assertEquals(
-            client.privateKeyBundleV1?.preKeysList,
-            clientFromV1Bundle.privateKeyBundleV1?.preKeysList,
+            client.privateKeyBundleV1.preKeysList,
+            clientFromV1Bundle.privateKeyBundleV1.preKeysList,
         )
     }
 
@@ -67,15 +67,15 @@ class ClientTest {
         val fakeWallet = PrivateKeyBuilder()
         val client = Client().create(account = fakeWallet)
         val bundleV1 = client.v1keys
-        val clientFromV1Bundle = Client().buildFromV1Bundle(bundleV1!!)
+        val clientFromV1Bundle = Client().buildFromV1Bundle(bundleV1)
         assertEquals(client.address, clientFromV1Bundle.address)
         assertEquals(
-            client.privateKeyBundleV1?.identityKey,
-            clientFromV1Bundle.privateKeyBundleV1?.identityKey,
+            client.privateKeyBundleV1.identityKey,
+            clientFromV1Bundle.privateKeyBundleV1.identityKey,
         )
         assertEquals(
-            client.privateKeyBundleV1?.preKeysList,
-            clientFromV1Bundle.privateKeyBundleV1?.preKeysList,
+            client.privateKeyBundleV1.preKeysList,
+            clientFromV1Bundle.privateKeyBundleV1.preKeysList,
         )
     }
 
@@ -93,7 +93,8 @@ class ClientTest {
         assert(client.canMessageV3(listOf(client.address)))
 
         val bundle = client.privateKeyBundle
-        val clientFromV1Bundle = Client().buildFromBundle(bundle, account = fakeWallet, options = options)
+        val clientFromV1Bundle =
+            Client().buildFromBundle(bundle, account = fakeWallet, options = options)
         assertEquals(client.address, clientFromV1Bundle.address)
         assertEquals(
             client.privateKeyBundleV1.identityKey,
@@ -147,8 +148,10 @@ class ClientTest {
                     appContext = context
                 )
             )
-        client.conversations.newGroup(listOf(client2.address,))
-        runBlocking { client.conversations.syncGroups() }
+        runBlocking {
+            client.conversations.newGroup(listOf(client2.address))
+            client.conversations.syncGroups()
+        }
         assertEquals(client.conversations.listGroups().size, 1)
 
         client.deleteLocalDatabase()

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

@@ -59,8 +59,9 @@ class CodecTest {
         Client.register(codec = NumberCodec())
         val fixtures = fixtures()
         val aliceClient = fixtures.aliceClient
-        val aliceConversation =
+        val aliceConversation = runBlocking {
             aliceClient.conversations.newConversation(fixtures.bob.walletAddress)
+        }
         runBlocking {
             aliceConversation.send(
                 content = 3.14,
@@ -81,8 +82,9 @@ class CodecTest {
         Client.register(codec = CompositeCodec())
         val fixtures = fixtures()
         val aliceClient = fixtures.aliceClient
-        val aliceConversation =
+        val aliceConversation = runBlocking {
             aliceClient.conversations.newConversation(fixtures.bob.walletAddress)
+        }
         val textContent = TextCodec().encode(content = "hiya")
         val source = DecodedComposite(encodedContent = textContent)
         runBlocking {
@@ -102,8 +104,9 @@ class CodecTest {
         Client.register(codec = NumberCodec())
         val fixtures = fixtures()
         val aliceClient = fixtures.aliceClient!!
-        val aliceConversation =
+        val aliceConversation = runBlocking {
             aliceClient.conversations.newConversation(fixtures.bob.walletAddress)
+        }
         val textContent = TextCodec().encode(content = "sup")
         val numberContent = NumberCodec().encode(content = 3.14)
         val source = DecodedComposite(
@@ -131,9 +134,10 @@ class CodecTest {
         val codec = NumberCodec()
         Client.register(codec = codec)
         val fixtures = fixtures()
-        val aliceClient = fixtures.aliceClient!!
-        val aliceConversation =
+        val aliceClient = fixtures.aliceClient
+        val aliceConversation = runBlocking {
             aliceClient.conversations.newConversation(fixtures.bob.walletAddress)
+        }
         runBlocking {
             aliceConversation.send(
                 content = 3.14,
@@ -165,12 +169,14 @@ class CodecTest {
         repeat(5) {
             val account = PrivateKeyBuilder()
             val client = Client().create(account, clientOptions)
-            conversations.add(
-                alixClient.conversations.newConversation(
-                    client.address,
-                    context = InvitationV1ContextBuilder.buildFromConversation(conversationId = "hi")
+            runBlocking {
+                conversations.add(
+                    alixClient.conversations.newConversation(
+                        client.address,
+                        context = InvitationV1ContextBuilder.buildFromConversation(conversationId = "hi")
+                    )
                 )
-            )
+            }
         }
 
         val thirtyDayPeriodsSinceEpoch = Instant.now().epochSecond / 60 / 60 / 24 / 30

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

@@ -5,6 +5,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.xmtp.android.library.messages.walletAddress
+
 @RunWith(AndroidJUnit4::class)
 class ContactsTest {