@@ -121,9 +121,7 @@ func sharedDBSetup(in *Input, bcOut *blockchain.Output) (*Output, error) {
121121 return nil , fmt .Errorf ("custom_ports can be used only with override_mode = 'each'" )
122122 }
123123 }
124- if in .NodeSpecs [overrideIdx ].Node .Name == "" {
125- nodeName = fmt .Sprintf ("node%d" , i )
126- }
124+
127125 eg .Go (func () error {
128126 var net string
129127 net , err = clnode .NewNetworkCfgOneNetworkAllNodes (bcOut )
@@ -133,8 +131,12 @@ func sharedDBSetup(in *Input, bcOut *blockchain.Output) (*Output, error) {
133131 if in .NodeSpecs [overrideIdx ].Node .TestConfigOverrides != "" {
134132 net = in .NodeSpecs [overrideIdx ].Node .TestConfigOverrides
135133 }
136-
137- nodeName = fmt .Sprintf ("%s-%s" , in .Name , nodeName )
134+ if in .NodeSpecs [overrideIdx ].Node .Name == "" {
135+ nodeName = fmt .Sprintf ("node%d" , i )
136+ } else {
137+ nodeName = in .NodeSpecs [overrideIdx ].Node .Name
138+ }
139+ nodeWithNodeSetPrefixName := fmt .Sprintf ("%s-%s" , in .Name , nodeName )
138140
139141 nodeSpec := & clnode.Input {
140142 DbInput : in .DbInput ,
@@ -144,7 +146,7 @@ func sharedDBSetup(in *Input, bcOut *blockchain.Output) (*Output, error) {
144146 DebuggerPort : dlvPortStart + i ,
145147 CustomPorts : in .NodeSpecs [overrideIdx ].Node .CustomPorts ,
146148 Image : in .NodeSpecs [overrideIdx ].Node .Image ,
147- Name : nodeName ,
149+ Name : nodeWithNodeSetPrefixName ,
148150 PullImage : in .NodeSpecs [overrideIdx ].Node .PullImage ,
149151 DockerFilePath : in .NodeSpecs [overrideIdx ].Node .DockerFilePath ,
150152 DockerContext : in .NodeSpecs [overrideIdx ].Node .DockerContext ,
0 commit comments