From d4f86e3b57aae310d42048b2577c33b5437a3f28 Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Tue, 2 Sep 2025 11:53:54 +0200 Subject: [PATCH 1/2] Expose a function that is used to name containers in simple node set --- framework/.changeset/v0.10.17.md | 1 + framework/components/simple_node_set/node_set.go | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 framework/.changeset/v0.10.17.md diff --git a/framework/.changeset/v0.10.17.md b/framework/.changeset/v0.10.17.md new file mode 100644 index 000000000..525c91269 --- /dev/null +++ b/framework/.changeset/v0.10.17.md @@ -0,0 +1 @@ +- Expose a function that is used to name containers in simple node set diff --git a/framework/components/simple_node_set/node_set.go b/framework/components/simple_node_set/node_set.go index 95879751f..030a06041 100644 --- a/framework/components/simple_node_set/node_set.go +++ b/framework/components/simple_node_set/node_set.go @@ -65,6 +65,10 @@ func NewSharedDBNodeSet(in *Input, bcOut *blockchain.Output) (*Output, error) { return out, nil } +func NodeNamePrefix(nodeSetName string) string { + return nodeSetName + "-" + "node" +} + func printURLs(out *Output) { if out == nil { return @@ -113,7 +117,6 @@ func sharedDBSetup(in *Input, bcOut *blockchain.Output) (*Output, error) { mu := &sync.Mutex{} for i := 0; i < in.Nodes; i++ { overrideIdx := i - var nodeName string if in.OverrideMode == "all" { if len(in.NodeSpecs[overrideIdx].Node.CustomPorts) > 0 { return nil, fmt.Errorf("custom_ports can be used only with override_mode = 'each'") @@ -132,8 +135,7 @@ func sharedDBSetup(in *Input, bcOut *blockchain.Output) (*Output, error) { if in.NodeSpecs[overrideIdx].Node.TestConfigOverrides != "" { net = in.NodeSpecs[overrideIdx].Node.TestConfigOverrides } - nodeName = fmt.Sprintf("node%d", i) - nodeWithNodeSetPrefixName := fmt.Sprintf("%s-%s", in.Name, nodeName) + nodeWithNodeSetPrefixName := NodeNamePrefix(in.Name) + "-" + fmt.Sprint(i) nodeSpec := &clnode.Input{ NoDNS: in.NoDNS, From fd0c5270cf41b65f9d3759bfdeec41db05bcccbf Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Tue, 2 Sep 2025 13:42:05 +0200 Subject: [PATCH 2/2] fix node naming --- framework/components/simple_node_set/node_set.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/components/simple_node_set/node_set.go b/framework/components/simple_node_set/node_set.go index 030a06041..43078e3c6 100644 --- a/framework/components/simple_node_set/node_set.go +++ b/framework/components/simple_node_set/node_set.go @@ -135,7 +135,7 @@ func sharedDBSetup(in *Input, bcOut *blockchain.Output) (*Output, error) { if in.NodeSpecs[overrideIdx].Node.TestConfigOverrides != "" { net = in.NodeSpecs[overrideIdx].Node.TestConfigOverrides } - nodeWithNodeSetPrefixName := NodeNamePrefix(in.Name) + "-" + fmt.Sprint(i) + nodeWithNodeSetPrefixName := NodeNamePrefix(in.Name) + fmt.Sprint(i) nodeSpec := &clnode.Input{ NoDNS: in.NoDNS,