fix up the tests

xmtp · Sep 16, 2024 · db3495d · db3495d
1 parent b68cb66
commit db3495d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/library/src/androidTest/java/org/xmtp/android/library/ClientTest.kt b/library/src/androidTest/java/org/xmtp/android/library/ClientTest.kt
@@ -29,8 +29,8 @@ class ClientTest {
     fun testHasPrivateKeyBundleV1() {
         val fakeWallet = PrivateKeyBuilder()
         val client = runBlocking { Client().create(account = fakeWallet) }
-        assertEquals(1, client.privateKeyBundleV1.preKeysList?.size)
-        val preKey = client.privateKeyBundleV1.preKeysList?.get(0)
+        assertEquals(1, client.v1keys.preKeysList?.size)
+        val preKey = client.v1keys.preKeysList?.get(0)
         assert(preKey?.publicKey?.hasSignature() ?: false)
     }
 
@@ -56,12 +56,12 @@ class ClientTest {
         val clientFromV1Bundle = runBlocking { Client().buildFromBundle(bundle) }
         assertEquals(client.address, clientFromV1Bundle.address)
         assertEquals(
-            client.privateKeyBundleV1.identityKey,
-            clientFromV1Bundle.privateKeyBundleV1.identityKey,
+            client.v1keys.identityKey,
+            clientFromV1Bundle.v1keys.identityKey,
         )
         assertEquals(
-            client.privateKeyBundleV1.preKeysList,
-            clientFromV1Bundle.privateKeyBundleV1.preKeysList,
+            client.v1keys.preKeysList,
+            clientFromV1Bundle.v1keys.preKeysList,
         )
     }
 
@@ -73,12 +73,12 @@ class ClientTest {
         val clientFromV1Bundle = runBlocking { Client().buildFromV1Bundle(bundleV1) }
         assertEquals(client.address, clientFromV1Bundle.address)
         assertEquals(
-            client.privateKeyBundleV1.identityKey,
-            clientFromV1Bundle.privateKeyBundleV1.identityKey,
+            client.v1keys.identityKey,
+            clientFromV1Bundle.v1keys.identityKey,
         )
         assertEquals(
-            client.privateKeyBundleV1.preKeysList,
-            clientFromV1Bundle.privateKeyBundleV1.preKeysList,
+            client.v1keys.preKeysList,
+            clientFromV1Bundle.v1keys.preKeysList,
         )
     }
 
@@ -107,8 +107,8 @@ class ClientTest {
         }
         assertEquals(client.address, clientFromV1Bundle.address)
         assertEquals(
-            client.privateKeyBundleV1.identityKey,
-            clientFromV1Bundle.privateKeyBundleV1.identityKey,
+            client.v1keys.identityKey,
+            clientFromV1Bundle.v1keys.identityKey,
         )
 
         runBlocking {

diff --git a/library/src/androidTest/java/org/xmtp/android/library/ConversationsTest.kt b/library/src/androidTest/java/org/xmtp/android/library/ConversationsTest.kt
@@ -63,7 +63,7 @@ class ConversationsTest {
         val newWallet = PrivateKeyBuilder()
         val newClient = runBlocking { Client().create(account = newWallet) }
         val message = MessageV1Builder.buildEncode(
-            sender = newClient.privateKeyBundleV1,
+            sender = newClient.v1keys,
             recipient = fixtures.aliceClient.v1keys.toPublicKeyBundle(),
             message = TextCodec().encode(content = "hello").toByteArray(),
             timestamp = created

diff --git a/library/src/androidTest/java/org/xmtp/android/library/LocalInstrumentedTest.kt b/library/src/androidTest/java/org/xmtp/android/library/LocalInstrumentedTest.kt
@@ -352,7 +352,7 @@ class LocalInstrumentedTest {
     private fun publishLegacyContact(client: Client) {
         val contactBundle = Contact.ContactBundle.newBuilder().also {
             it.v1 = it.v1.toBuilder().apply {
-                keyBundle = client.privateKeyBundleV1.toPublicKeyBundle()
+                keyBundle = client.v1keys.toPublicKeyBundle()
             }.build()
         }.build()
         val envelope = Envelope.newBuilder().also {

diff --git a/library/src/androidTest/java/org/xmtp/android/library/TestHelpers.kt b/library/src/androidTest/java/org/xmtp/android/library/TestHelpers.kt
@@ -66,7 +66,7 @@ data class Fixtures(
     fun publishLegacyContact(client: Client) {
         val contactBundle = ContactBundle.newBuilder().also { builder ->
             builder.v1 = builder.v1.toBuilder().also {
-                it.keyBundle = client.privateKeyBundleV1.toPublicKeyBundle()
+                it.keyBundle = client.v1keys.toPublicKeyBundle()
             }.build()
         }.build()
         val envelope = Envelope.newBuilder().apply {