Fix a few blockers preventing us from bumping ktor

3 files changed, 13 insertions, 19 deletions

diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/firewall/FirewallClient.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/firewall/FirewallClient.kt
index 3e2a35971a..3d6264047b 100644
--- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/firewall/FirewallClient.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/firewall/FirewallClient.kt
@@ -13,10 +13,7 @@ import io.ktor.http.URLProtocol
 import io.ktor.http.contentType
 import io.ktor.serialization.kotlinx.json.json
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.modules.SerializersModule
-import kotlinx.serialization.modules.contextual
 import net.mullvad.mullvadvpn.test.e2e.BuildConfig
-import net.mullvad.mullvadvpn.test.e2e.serializer.NanoSecondsTimestampSerializer
 
 class FirewallClient(private val httpClient: HttpClient = defaultHttpClient()) {
     suspend fun createRule(rule: DropRule) {
@@ -50,12 +47,9 @@ private fun defaultHttpClient(): HttpClient =
         install(ContentNegotiation) {
             json(
                 Json {
+                    ignoreUnknownKeys = true
                     isLenient = true
                     prettyPrint = true
-
-                    serializersModule = SerializersModule {
-                        contextual(NanoSecondsTimestampSerializer)
-                    }
                 }
             )
         }
diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/Packet.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/Packet.kt
index cd6b2b855e..d39067e9c8 100644
--- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/Packet.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/Packet.kt
@@ -1,9 +1,9 @@
 package net.mullvad.mullvadvpn.test.e2e.router.packetCapture
 
 import java.time.ZonedDateTime
-import kotlinx.serialization.Contextual
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import net.mullvad.mullvadvpn.test.e2e.serializer.NanoSecondsTimestampSerializer
 import net.mullvad.mullvadvpn.test.e2e.serializer.PacketSerializer
 
 @Serializable(with = PacketSerializer::class)
@@ -13,13 +13,19 @@ sealed interface Packet {
 }
 
 @Serializable
-data class RxPacket(@SerialName("timestamp") @Contextual override val date: ZonedDateTime) :
-    Packet {
+data class RxPacket(
+    @SerialName("timestamp")
+    @Serializable(with = NanoSecondsTimestampSerializer::class)
+    override val date: ZonedDateTime
+) : Packet {
     @SerialName("from_peer") override val fromPeer: Boolean = false
 }
 
 @Serializable
-data class TxPacket(@SerialName("timestamp") @Contextual override val date: ZonedDateTime) :
-    Packet {
+data class TxPacket(
+    @SerialName("timestamp")
+    @Serializable(with = NanoSecondsTimestampSerializer::class)
+    override val date: ZonedDateTime
+) : Packet {
     @SerialName("from_peer") override val fromPeer: Boolean = true
 }
diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/PacketCapture.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/PacketCapture.kt
index 7854170114..5122227d3a 100644
--- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/PacketCapture.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/PacketCapture.kt
@@ -20,11 +20,8 @@ import java.util.UUID
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.modules.SerializersModule
-import kotlinx.serialization.modules.contextual
 import net.mullvad.mullvadvpn.test.e2e.BuildConfig
 import net.mullvad.mullvadvpn.test.e2e.misc.Networking
-import net.mullvad.mullvadvpn.test.e2e.serializer.NanoSecondsTimestampSerializer
 import net.mullvad.mullvadvpn.test.e2e.serializer.PacketCaptureSessionSerializer
 import org.junit.jupiter.api.fail
 
@@ -68,12 +65,9 @@ private fun defaultHttpClient(): HttpClient =
         install(ContentNegotiation) {
             json(
                 Json {
+                    ignoreUnknownKeys = true
                     isLenient = true
                     prettyPrint = true
-
-                    serializersModule = SerializersModule {
-                        contextual(NanoSecondsTimestampSerializer)
-                    }
                 }
             )
         }