status-im/cs-codex-dist-tests
2
0
Fork 0
mirror of synced 2025-02-23 13:38:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverts combining http and ws ports. Fixes runner location utils.

Browse Source
This commit is contained in:
benbierens 2023-09-22 09:52:30 +02:00
parent e0a734591f
commit ea09605827
No known key found for this signature in database
GPG Key ID: FE44815D96D0A1AA
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Framework/KubernetesWorkflow/RunnerLocationUtils.cs
View File

@ -21,7 +21,7 @@ namespace KubernetesWorkflow
{ {
knownLocation = RunnerLocation.InternalToCluster; knownLocation = RunnerLocation.InternalToCluster;
} }
if (PingHost(Format(container.ClusterExternalAddress))) else if (PingHost(Format(container.ClusterExternalAddress)))
{ {
knownLocation = RunnerLocation.ExternalToCluster; knownLocation = RunnerLocation.ExternalToCluster;
} }

4
ProjectPlugins/GethPlugin/GethContainerRecipe.cs
View File

@ -9,6 +9,7 @@ namespace GethPlugin
public const string HttpPortTag = "http_port"; public const string HttpPortTag = "http_port";
public const string DiscoveryPortTag = "disc_port"; public const string DiscoveryPortTag = "disc_port";
public const string WsPortTag = "ws_port";
public const string AccountsFilename = "accounts.csv"; public const string AccountsFilename = "accounts.csv";
public override string AppName => "geth"; public override string AppName => "geth";
@ -33,6 +34,7 @@ namespace GethPlugin
var args = $"--http.addr 0.0.0.0 --http.port {httpPort.Number} --port {discovery.Number} --discovery.port {discovery.Number} {defaultArgs}"; var args = $"--http.addr 0.0.0.0 --http.port {httpPort.Number} --port {discovery.Number} --discovery.port {discovery.Number} {defaultArgs}";
var authRpc = AddInternalPort(); var authRpc = AddInternalPort();
var wsPort = AddInternalPort(tag: WsPortTag);
if (config.BootstrapNode != null) if (config.BootstrapNode != null)
{ {
@ -43,7 +45,7 @@ namespace GethPlugin
args += bootstrapArg; args += bootstrapArg;
} }
return args + $" --authrpc.port {authRpc.Number} --ws --ws.addr 0.0.0.0 --ws.port {httpPort.Number}"; return args + $" --authrpc.port {authRpc.Number} --ws --ws.addr 0.0.0.0 --ws.port {wsPort.Number}";
} }
private void UnlockAccounts(int startIndex, int numberOfAccounts) private void UnlockAccounts(int startIndex, int numberOfAccounts)

2
ProjectPlugins/GethPlugin/GethStarter.cs
View File

@ -33,7 +33,7 @@ namespace GethPlugin
if (discoveryPort == null) throw new Exception("Expected discovery port to be created."); if (discoveryPort == null) throw new Exception("Expected discovery port to be created.");
var httpPort = container.Recipe.GetPortByTag(GethContainerRecipe.HttpPortTag); var httpPort = container.Recipe.GetPortByTag(GethContainerRecipe.HttpPortTag);
if (httpPort == null) throw new Exception("Expected http port to be created."); if (httpPort == null) throw new Exception("Expected http port to be created.");
var wsPort = container.Recipe.GetPortByTag(GethContainerRecipe.HttpPortTag); var wsPort = container.Recipe.GetPortByTag(GethContainerRecipe.WsPortTag);
if (wsPort == null) throw new Exception("Expected ws port to be created."); if (wsPort == null) throw new Exception("Expected ws port to be created.");
Log($"Geth node started."); Log($"Geth node started.");