From 385d13f4a90e8625d85998b0bd6588a9f4569653 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Tue, 24 Oct 2023 18:57:14 +1100
Subject: [PATCH] Remove local delay

---
 hole-punch-interop/src/generator.ts | 10 +++++-----
 hole-punch-interop/testplans.ts     |  7 +++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/hole-punch-interop/src/generator.ts b/hole-punch-interop/src/generator.ts
index 85025fc99..2f8a8bbf6 100644
--- a/hole-punch-interop/src/generator.ts
+++ b/hole-punch-interop/src/generator.ts
@@ -5,7 +5,7 @@ import {ComposeSpecification} from "../compose-spec/compose-spec";
 import {sanitizeComposeName} from "./lib";
 import path from "path";
 
-export async function buildTestSpecs(versions: Array<Version>, nameFilter: string | null, nameIgnore: string | null, routerImageId: string, relayImageId: string, routerDelay: number, relayDelay: number, localDelay: number, assetDir: string): Promise<Array<ComposeSpecification>> {
+export async function buildTestSpecs(versions: Array<Version>, nameFilter: string | null, nameIgnore: string | null, routerImageId: string, relayImageId: string, routerDelay: number, relayDelay: number, assetDir: string): Promise<Array<ComposeSpecification>> {
     sqlite3.verbose();
 
     const db = await open({
@@ -42,12 +42,14 @@ export async function buildTestSpecs(versions: Array<Version>, nameFilter: strin
                 return null
             }
 
-            return buildSpec(name, testCase.dialerImage, testCase.listenerImage, routerImageId, relayImageId, testCase.transport, routerDelay, relayDelay, localDelay, assetDir, {})
+            return buildSpec(name, testCase.dialerImage, testCase.listenerImage, routerImageId, relayImageId, testCase.transport, routerDelay, relayDelay, assetDir, {})
         })
         .filter(spec => spec !== null)
 }
 
-function buildSpec(name: string, dialerImage: string, listenerImage: string, routerImageId: string, relayImageId: string, transport: string, routerDelay: number, relayDelay: number, localDelay: number, assetDir: string, extraEnv: { [key: string]: string }): ComposeSpecification {
+function buildSpec(name: string, dialerImage: string, listenerImage: string, routerImageId: string, relayImageId: string, transport: string, routerDelay: number, relayDelay: number, assetDir: string, extraEnv: {
+    [p: string]: string
+}): ComposeSpecification {
     let internetNetworkName = `${sanitizeComposeName(name)}_internet`
 
     let startupScriptFn = (actor: "dialer" | "listener") => (`
@@ -58,8 +60,6 @@ function buildSpec(name: string, dialerImage: string, listenerImage: string, rou
 
         ip route add $$INTERNET_SUBNET via $$ROUTER_IP dev eth0
 
-        tc qdisc add dev eth0 root netem delay ${localDelay}ms; # Add a local delay to all outgoing packets
-
         tcpdump -i eth0 -w /tmp/${actor}.pcap &
 
         sleep 2 # Let tcpdump start up
diff --git a/hole-punch-interop/testplans.ts b/hole-punch-interop/testplans.ts
index e6449b898..f69057ecf 100644
--- a/hole-punch-interop/testplans.ts
+++ b/hole-punch-interop/testplans.ts
@@ -72,14 +72,13 @@ import path from "path";
 
     const routerDelay = 100;
     const relayDelay = 25;
-    const localDelay = 0;
 
-    const rttRelayedConnection = routerDelay * 2 + relayDelay * 2 + localDelay * 2;
-    const rttDirectConnection = routerDelay * 2 + localDelay * 2;
+    const rttRelayedConnection = routerDelay * 2 + relayDelay * 2;
+    const rttDirectConnection = routerDelay * 2;
 
     const assetDir = path.join(__dirname, "runs");
 
-    let testSpecs = await buildTestSpecs(versions.concat(extraVersions), nameFilter, nameIgnore, routerImageId, relayImageId, routerDelay, relayDelay, localDelay, assetDir)
+    let testSpecs = await buildTestSpecs(versions.concat(extraVersions), nameFilter, nameIgnore, routerImageId, relayImageId, routerDelay, relayDelay, assetDir)
 
     console.log(`Running ${testSpecs.length} tests`)
     const failures: Array<{ name: String, e: ExecException }> = []