Refactor a single binary

hole-punching-tests/Cargo.toml

@@ -6,7 +6,7 @@ publish = false
 license = "MIT"
 
 [dependencies]
-clap = { version = "4.3.8", features = ["derive"] }
+clap = { version = "4.3.8", features = ["derive", "env"] }
 env_logger = "0.10.0"
 futures = "0.3.28"
 libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros", "noise", "ping", "relay", "tcp", "yamux", "quic"] }

hole-punching-tests/Dockerfile

@@ -12,9 +12,7 @@ RUN --mount=type=cache,target=./target \
     cargo build --release --package hole-punching-tests --target x86_64-unknown-linux-musl
 
 RUN --mount=type=cache,target=./target \
-    mv ./target/x86_64-unknown-linux-musl/release/hp_client /usr/local/bin/hp_client
-RUN --mount=type=cache,target=./target \
-    mv ./target/x86_64-unknown-linux-musl/release/relay /usr/local/bin/relay
+    mv ./target/x86_64-unknown-linux-musl/release/hole-punching-tests /usr/local/bin/hole-punching-tests
 
 FROM ubuntu:jammy
 
@@ -23,7 +21,6 @@ RUN --mount=type=cache,target=/var/cache/apt apt-get update && apt-get install -
 # Debugging tools
 RUN --mount=type=cache,target=/var/cache/apt apt-get install -y tcpdump ncat iputils-ping
 
-COPY --from=builder /usr/local/bin/hp_client /usr/bin/hp_client
-COPY --from=builder /usr/local/bin/relay /usr/bin/relay
+COPY --from=builder /usr/local/bin/hole-punching-tests /usr/bin/hole-punching-tests
 
 ENV RUST_BACKTRACE=1

hole-punching-tests/docker-compose.yml

@@ -9,7 +9,9 @@ services:
       context: ..
     container_name: relay
     init: true
-    command: /usr/bin/relay --listen-addr 17.0.0.10
+    command: /usr/bin/hole-punching-tests relay
+    environment:
+      LISTEN_ADDR: 17.0.0.10
     networks:
       internet:
         ipv4_address: 17.0.0.10
@@ -32,8 +34,9 @@ services:
       dockerfile: ./hole-punching-tests/Dockerfile
       context: ..
     container_name: alice
-    init: true
-    command: ["/bin/bash", "-c", "ip route add 17.0.0.0/16 via 192.168.0.10 dev eth0 && /usr/bin/hp_client --mode dial --transport tcp"]
+    command: ["/bin/bash", "-c", "ip route add 17.0.0.0/16 via 192.168.0.10 dev eth0 && /usr/bin/hole-punching-tests dial"]
+    environment:
+      TRANSPORT: tcp
     networks:
       alice_lan:
         ipv4_address: 192.168.0.11
@@ -57,8 +60,9 @@ services:
       dockerfile: ./hole-punching-tests/Dockerfile
       context: ..
     container_name: bob
-    init: true
-    command: ["/bin/bash", "-c", "ip route add 17.0.0.0/16 via 192.168.1.10 dev eth0 && /usr/bin/hp_client --mode listen --transport tcp"]
+    command: ["/bin/bash", "-c", "ip route add 17.0.0.0/16 via 192.168.1.10 dev eth0 && /usr/bin/hole-punching-tests listen"]
+    environment:
+      TRANSPORT: tcp
     networks:
       bob_lan:
         ipv4_address: 192.168.1.11