Add quic to interop client (#425)

Author: lucassaldanha

Dockerfile

@@ -0,0 +1,12 @@
+FROM openjdk:11-jdk AS build
+COPY . /jvm-libp2p
+WORKDIR /jvm-libp2p
+RUN ./gradlew build -x test --no-daemon
+
+FROM openjdk:11-jdk
+WORKDIR /jvm-libp2p
+COPY --from=build /jvm-libp2p/interop-test-client/build/distributions/interop-test-client*.tar .
+RUN tar -xf interop-test-client*.tar && rm interop-test-client*.tar
+
+ENTRYPOINT ["/jvm-libp2p/interop-test-client-develop/bin/interop-test-client"]
+EXPOSE 4001

interop-test-client/build.gradle.kts

@@ -1,31 +1,16 @@
+import org.jetbrains.kotlin.cli.jvm.compiler.findMainClass
+
 plugins {
-    id("java")
-    id("com.bmuschko.docker-java-application") version "9.4.0"
+    id("application")
+    id("kotlin")
+}
+
+application {
+    mainClass = "io.libp2p.interop.InteropTestAgentKt"
 }
 
 dependencies {
     implementation(project(":libp2p"))
     implementation("redis.clients:jedis:6.1.0")
     runtimeOnly("org.apache.logging.log4j:log4j-slf4j2-impl")
 }
-
-docker {
-    javaApplication {
-        baseImage.set("openjdk:11-jdk")
-        ports.set(listOf(4041))
-    }
-}
-
-val composeFileSpec: CopySpec = copySpec {
-    from("src/test/resources")
-    include("compose.yaml")
-}
-
-val copyAssets = tasks.register<Copy>("copyAssets") {
-    into(layout.buildDirectory.dir("docker"))
-    with(composeFileSpec)
-}
-
-tasks.dockerCreateDockerfile {
-    dependsOn(copyAssets)
-}

interop-test-client/src/main/kotlin/io/libp2p/interop/InteropTestAgent.kt

@@ -28,6 +28,7 @@ import java.util.stream.Collectors
 import kotlin.random.Random
 import kotlin.system.exitProcess
 
+const val QUIC_V1 = "quic-v1"
 private const val REDIS_KEY_LISTENER_ADDRESS = "listenerAddr"
 
 class InteropTestAgent(val params: InteropTestParams) {
@@ -59,7 +60,7 @@ class InteropTestAgent(val params: InteropTestParams) {
             .thenCompose { startJedisConnection() }
             .thenCompose { jedis ->
                 if (params.isDialer) {
-                    startDialer(jedis, node)
+                    startDialer(jedis, node, advertisedAddress)
                 } else {
                     startListener(jedis, advertisedAddress)
                 }
@@ -72,7 +73,7 @@ class InteropTestAgent(val params: InteropTestParams) {
         listenAddresses: ArrayList<String>
     ): Host = hostJ(Builder.Defaults.None, fn = {
         it.identity.factory = { privateKey }
-        if (params.transport == "quic-v1") {
+        if (params.transport == QUIC_V1) {
             it.secureTransports.add(QuicTransport::ECDSA)
         } else {
             it.transports.add(::TcpTransport)
@@ -135,9 +136,13 @@ class InteropTestAgent(val params: InteropTestParams) {
     /*
       Start dialer and try to connect with a listener
      */
-    private fun startDialer(jedis: Jedis, node: Host): CompletableFuture<Void> {
+    private fun startDialer(
+        jedis: Jedis,
+        node: Host,
+        advertisedAddress: Multiaddr
+    ): CompletableFuture<Void> {
         return CompletableFuture.supplyAsync {
-            printDiagnosticsLog("Starting dialer")
+            printDiagnosticsLog("Starting dialer with advertisedAddress: $advertisedAddress")
 
             val listenerAddresses =
                 jedis.blpop(params.testTimeoutInSeconds, REDIS_KEY_LISTENER_ADDRESS)
@@ -175,7 +180,7 @@ class InteropTestAgent(val params: InteropTestParams) {
         advertisedAddress: Multiaddr
     ): CompletableFuture<Void> {
         return CompletableFuture.supplyAsync {
-            println("Starting listener with advertisedAddress: $advertisedAddress")
+            printDiagnosticsLog("Starting listener with advertisedAddress: $advertisedAddress")
 
             jedis.rpush(REDIS_KEY_LISTENER_ADDRESS, advertisedAddress.toString())
 
@@ -222,7 +227,6 @@ private fun printDiagnosticsLog(msg: String) {
     System.err.println(msg)
 }
 
-@SuppressWarnings("unused")
 fun main() {
     try {
         val params = InteropTestParams.Builder().fromEnvironmentVariables().build()

interop-test-client/src/main/kotlin/io/libp2p/interop/InteropTestParams.kt

@@ -35,8 +35,10 @@ class InteropTestParams(
         fun build(): InteropTestParams {
             checkNonEmptyParam("transport", transport)
             checkNonEmptyParam("muxer", muxer)
-            checkNonEmptyParam("security", security)
-            checkNonEmptyParam("redis_addr", security)
+            if (transport != QUIC_V1) {
+                checkNonEmptyParam("security", security)
+            }
+            checkNonEmptyParam("redis_addr", redisAddress)
 
             if (ip == null || ip!!.isBlank()) {
                 ip = "0.0.0.0"

interop-test-client/src/test/resources/compose.yaml

@@ -24,6 +24,8 @@ services:
     depends_on:
       redis:
         condition: service_started
+      listener:
+        condition: service_started
   redis:
     image: "redis:7-alpine"
     ports: