propagate transport coroutine context

Author: yakivy

krpc/krpc-test/src/commonTest/kotlin/kotlinx/rpc/krpc/test/CoroutineContextPropagationTest.kt

@@ -39,7 +39,7 @@ class CoroutineContextPropagationTest {
     @Test
     fun test() = runTest {
         var actualContext: CoroutineElement? = null
-        val transport = LocalTransport(transportContext = CoroutineElement("transport"))
+        val transport = LocalTransport(CoroutineElement("transport"))
         val server = KrpcTestServer(rpcServerConfig, transport.server)
         val client = KrpcTestClient(rpcClientConfig, transport.client)
         withContext(CoroutineElement("server")) {

krpc/krpc-test/src/commonTest/kotlin/kotlinx/rpc/krpc/test/LocalTransport.kt

@@ -17,12 +17,9 @@ import kotlin.time.Clock
 import kotlin.time.ExperimentalTime
 
 class LocalTransport(
-    parentScope: CoroutineScope? = null,
-    transportContext: CoroutineContext? = null,
+    parentContext: CoroutineContext? = null,
 ) : CoroutineScope {
-    override val coroutineContext = parentScope
-        ?.run { SupervisorJob(coroutineContext.job) }
-        ?: SupervisorJob()
+    override val coroutineContext = SupervisorJob(parentContext?.job)
 
     private val clientIncoming = Channel<KrpcTransportMessage>()
     private val serverIncoming = Channel<KrpcTransportMessage>()
@@ -32,7 +29,7 @@ class LocalTransport(
 
     val client: KrpcTransport = object : KrpcTransport {
         override val coroutineContext: CoroutineContext = Job(this@LocalTransport.coroutineContext.job).let {
-            if(transportContext != null) transportContext + it
+            if(parentContext != null) parentContext + it
             else it
         }
 
@@ -49,7 +46,7 @@ class LocalTransport(
 
     val server: KrpcTransport = object : KrpcTransport {
         override val coroutineContext: CoroutineContext = Job(this@LocalTransport.coroutineContext.job).let {
-            if(transportContext != null) transportContext + it
+            if(parentContext != null) parentContext + it
             else it
         }
 

krpc/krpc-test/src/commonTest/kotlin/kotlinx/rpc/krpc/test/cancellation/CancellationToolkit.kt

@@ -50,7 +50,7 @@ class CancellationToolkit(scope: CoroutineScope) : CoroutineScope by scope {
         }
     }
 
-    val transport = LocalTransport(this)
+    val transport = LocalTransport(this.coroutineContext.job)
 
     val client by lazy {
         KrpcTestClient(rpcClientConfig {

krpc/krpc-test/src/jvmTest/kotlin/kotlinx/rpc/krpc/test/api/WireSamplingTestScope.kt

@@ -229,7 +229,7 @@ class WireSamplingTestScope(private val sampleName: String, scope: TestScope) :
 }
 
 private class WireToolkit(scope: CoroutineScope, format: SamplingFormat, val logger: RpcInternalCommonLogger? = null) {
-    val transport = LocalTransport(scope)
+    val transport = LocalTransport(scope.coroutineContext.job)
 
     val client by lazy {
         KrpcTestClient(rpcClientConfig {