fix up the linter and some more tests

Author: nplasterer

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

@@ -26,6 +26,19 @@ class ContactsTest {
         assertEquals(contactBundle?.walletAddress, fixtures.bob.walletAddress)
     }
 
+    @Test
+    fun testCachesContacts() {
+        val fixtures = fixtures()
+        fixtures.bobClient.ensureUserContactPublished()
+        // Look up the first time
+        fixtures.aliceClient.contacts.find(fixtures.bob.walletAddress)
+        fixtures.fakeApiClient.assertNoQuery {
+            val contactBundle = fixtures.aliceClient.contacts.find(fixtures.bob.walletAddress)
+            assertEquals(contactBundle?.walletAddress, fixtures.bob.walletAddress)
+        }
+        assert(fixtures.aliceClient.contacts.has(fixtures.bob.walletAddress))
+    }
+
     @Test
     fun testAllowAddress() {
         val fixtures = fixtures()

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

@@ -9,7 +9,6 @@ import org.junit.Assert.assertEquals
 import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.web3j.crypto.Hash
 import org.web3j.utils.Numeric
 import org.xmtp.android.library.codecs.TextCodec
 import org.xmtp.android.library.messages.InvitationV1
@@ -269,6 +268,7 @@ class MessageTest {
         assertEquals("hello from kotlin", messages[0].body)
         assertEquals(convo.topic, messages[0].topic)
     }
+
     @Test
     fun testGetsV2ID() {
         val envelopeMessageData =

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

@@ -5,7 +5,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.runBlocking
-import org.junit.Assert
+import org.junit.Assert.assertEquals
 import org.xmtp.android.library.codecs.Fetcher
 import org.xmtp.android.library.messages.ContactBundle
 import org.xmtp.android.library.messages.Envelope
@@ -44,11 +44,13 @@ class FakeWallet : SigningKey {
     }
 
     override suspend fun sign(data: ByteArray): Signature {
-        return privateKeyBuilder.sign(data)
+        val signature = privateKeyBuilder.sign(data)
+        return signature
     }
 
     override suspend fun sign(message: String): Signature {
-        return privateKeyBuilder.sign(message)
+        val signature = privateKeyBuilder.sign(message)
+        return signature
     }
 
     override val address: String
@@ -66,13 +68,13 @@ class FakeApiClient : ApiClient {
     private var authToken: String? = null
     private val responses: MutableMap<String, List<Envelope>> = mutableMapOf()
     val published: MutableList<Envelope> = mutableListOf()
-    private var forbiddingQueries = false
+    var forbiddingQueries = false
     private var stream = FakeStreamHolder()
 
     fun assertNoPublish(callback: () -> Unit) {
         val oldCount = published.size
         callback()
-        Assert.assertEquals(oldCount, published.size)
+        assertEquals(oldCount, published.size)
     }
 
     fun assertNoQuery(callback: () -> Unit) {
@@ -104,14 +106,6 @@ class FakeApiClient : ApiClient {
         return query(topic = topic.description, pagination)
     }
 
-    override suspend fun batchQuery(requests: List<MessageApiOuterClass.QueryRequest>): MessageApiOuterClass.BatchQueryResponse {
-        val response = query(requests.first().getContentTopics(0))
-
-        return MessageApiOuterClass.BatchQueryResponse.newBuilder().also {
-            it.addResponses(response)
-        }.build()
-    }
-
     suspend fun send(envelope: Envelope) {
         stream.emit(envelope)
     }
@@ -123,6 +117,16 @@ class FakeApiClient : ApiClient {
         return query(topic = topic, pagination = pagination).envelopesList
     }
 
+    override suspend fun batchQuery(requests: List<MessageApiOuterClass.QueryRequest>): MessageApiOuterClass.BatchQueryResponse {
+        val responses = requests.map {
+            query(it.getContentTopics(0), Pagination(after = Date(it.startTimeNs)))
+        }
+
+        return MessageApiOuterClass.BatchQueryResponse.newBuilder().also {
+            it.addAllResponses(responses)
+        }.build()
+    }
+
     override suspend fun query(
         topic: String,
         pagination: Pagination?,
@@ -141,12 +145,14 @@ class FakeApiClient : ApiClient {
 
         val startAt = pagination?.before
         if (startAt != null) {
-            result = result.filter { it.timestampNs < startAt.time * 1_000_000 }
+            result = result.filter { it.timestampNs < startAt.time }
                 .sortedBy { it.timestampNs }.toMutableList()
         }
         val endAt = pagination?.after
         if (endAt != null) {
-            result = result.filter { it.timestampNs > endAt.time * 1_000_000 }
+            result = result.filter {
+                it.timestampNs > endAt.time
+            }
                 .sortedBy { it.timestampNs }.toMutableList()
         }
         val limit = pagination?.limit
@@ -169,7 +175,6 @@ class FakeApiClient : ApiClient {
                 MessageApiOuterClass.SortDirection.SORT_DIRECTION_ASCENDING -> {
                     result = result.reversed().toMutableList()
                 }
-
                 else -> Unit
             }
         }
@@ -186,7 +191,6 @@ class FakeApiClient : ApiClient {
         published.addAll(envelopes)
         return PublishResponse.newBuilder().build()
     }
-
     override suspend fun subscribe2(request: Flow<MessageApiOuterClass.SubscribeRequest>): Flow<MessageApiOuterClass.Envelope> {
         val env = stream.counts().first()
 

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

@@ -18,7 +18,6 @@ import org.xmtp.proto.message.api.v1.MessageApiOuterClass.PublishResponse
 import org.xmtp.proto.message.api.v1.MessageApiOuterClass.QueryRequest
 import org.xmtp.proto.message.api.v1.MessageApiOuterClass.QueryResponse
 import org.xmtp.proto.message.api.v1.MessageApiOuterClass.SubscribeRequest
-import uniffi.xmtpv3.FfiV2ApiClient
 import java.io.Closeable
 import java.util.concurrent.TimeUnit
 

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

@@ -45,7 +45,6 @@ import uniffi.xmtpv3.FfiV2ApiClient
 import uniffi.xmtpv3.FfiXmtpClient
 import uniffi.xmtpv3.LegacyIdentitySource
 import uniffi.xmtpv3.createClient
-import uniffi.xmtpv3.createV2Client
 import uniffi.xmtpv3.getVersionInfo
 import java.io.File
 import java.nio.charset.StandardCharsets

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

@@ -7,7 +7,6 @@ import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.merge

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

@@ -28,7 +28,7 @@ enum class XMTPEnvironment(val rawValue: String) {
     }
 
     fun getUrl(): String {
-        return when(this) {
+        return when (this) {
             DEV -> "https://${getValue()}:443"
             PRODUCTION -> "https://${getValue()}:443"
             LOCAL -> "http://${getValue()}:5556"