From f5a1be34c62f26484a63ebc36b6ab9fa5b16691c Mon Sep 17 00:00:00 2001
From: benbierens <thatbenbierens@gmail.com>
Date: Fri, 21 Apr 2023 09:57:52 +0200
Subject: [PATCH] Puts geth websocket and http on same port.

---
 DistTestCore/Codex/CodexContainerRecipe.cs         | 2 +-
 DistTestCore/Marketplace/ContainerInfoExtractor.cs | 1 -
 DistTestCore/Marketplace/GethContainerRecipe.cs    | 4 +---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/DistTestCore/Codex/CodexContainerRecipe.cs b/DistTestCore/Codex/CodexContainerRecipe.cs
index 01f4933..53f5078 100644
--- a/DistTestCore/Codex/CodexContainerRecipe.cs
+++ b/DistTestCore/Codex/CodexContainerRecipe.cs
@@ -42,7 +42,7 @@ namespace DistTestCore.Codex
                 Additional(companionNode);
 
                 var ip = companionNode.RunningContainer.Pod.Ip;
-                var port = companionNode.RunningContainer.Recipe.GetPortByTag(GethContainerRecipe.WsPortTag).Number;
+                var port = companionNode.RunningContainer.Recipe.GetPortByTag(GethContainerRecipe.HttpPortTag).Number;
 
                 AddEnvVar("ETH_PROVIDER", $"ws://{ip}:{port}");
                 AddEnvVar("ETH_ACCOUNT", companionNode.Account);
diff --git a/DistTestCore/Marketplace/ContainerInfoExtractor.cs b/DistTestCore/Marketplace/ContainerInfoExtractor.cs
index 60470b8..c2e4501 100644
--- a/DistTestCore/Marketplace/ContainerInfoExtractor.cs
+++ b/DistTestCore/Marketplace/ContainerInfoExtractor.cs
@@ -1,6 +1,5 @@
 using KubernetesWorkflow;
 using Newtonsoft.Json;
-using System.Text;
 
 namespace DistTestCore.Marketplace
 {
diff --git a/DistTestCore/Marketplace/GethContainerRecipe.cs b/DistTestCore/Marketplace/GethContainerRecipe.cs
index f2c9d7c..85309cc 100644
--- a/DistTestCore/Marketplace/GethContainerRecipe.cs
+++ b/DistTestCore/Marketplace/GethContainerRecipe.cs
@@ -6,7 +6,6 @@ namespace DistTestCore.Marketplace
     {
         public const string DockerImage = "thatbenbierens/geth-confenv:latest";
         public const string HttpPortTag = "http_port";
-        public const string WsPortTag = "ws_port";
         public const string DiscoveryPortTag = "disc_port";
         public const string AccountFilename = "account_string.txt";
         public const string BootstrapPrivateKeyFilename = "bootstrap_private.key";
@@ -46,14 +45,13 @@ namespace DistTestCore.Marketplace
             var port = AddInternalPort();
             var authRpc = AddInternalPort();
             var httpPort = AddInternalPort(tag: HttpPortTag);
-            var wsPort = AddInternalPort(tag: WsPortTag);
 
             var bootPubKey = config.BootstrapNode.PubKey;
             var bootIp = config.BootstrapNode.RunningContainers.Containers[0].Pod.Ip;
             var bootPort = config.BootstrapNode.DiscoveryPort.Number;
             var bootstrapArg = $"--bootnodes enode://{bootPubKey}@{bootIp}:{bootPort}";
 
-            return $"--port {port.Number} --discovery.port {discovery.Number} --authrpc.port {authRpc.Number} --http.port {httpPort.Number} --ws --ws.addr 0.0.0.0 --ws.port {wsPort.Number} {bootstrapArg}";
+            return $"--port {port.Number} --discovery.port {discovery.Number} --authrpc.port {authRpc.Number} --http.addr 0.0.0.0 --http.port {httpPort.Number} --ws --ws.addr 0.0.0.0 --ws.port {httpPort.Number} {bootstrapArg}";
         }
     }
 }