fix(evm): stop creating a docker network the node never uses

The handler created a network, joined the besu container to it, and left it
behind. Nothing needed it: the FSC nodes are host processes and forge runs on
the host, so everything reaches the node over its published port on 127.0.0.1.
The container joins the default bridge instead, and there is nothing left to
clean up.

Its name was wrong in a way worth recording. It came from the root directory,
and every suite passes ./testdata, so the name was the string "testdata" for
all of them. The comment claimed that kept parallel runs apart when it did the
opposite: the two evm suites shared one network and one besu-testdata
container, and startup force-removes a container by that name, so a second run
would kill the first. The container is named after its reserved port now, which
is unique by construction.

Reported by adecaro on #2159.

Signed-off-by: atharrva01 <atharvaborade568@gmail.com>

Author: atharrva01

integration/nwo/token/evm/besu.go

@@ -41,8 +41,6 @@ const DefaultChainID int64 = 1337
 type BesuConfig struct {
 	// Image is the container image; DefaultBesuImage when empty.
 	Image string
-	// NetworkID is the docker network the container joins, so FSC nodes can reach it.
-	NetworkID string
 	// Name is the container name.
 	Name string
 	// Port is the host port the JSON-RPC endpoint is published on.
@@ -134,9 +132,9 @@ func StartBesu(ctx context.Context, cfg BesuConfig) (*Besu, error) {
 				}},
 			},
 		},
-		NetworkingConfig: &network.NetworkingConfig{
-			EndpointsConfig: map[string]*network.EndpointSettings{cfg.NetworkID: {}},
-		},
+		// No NetworkingConfig: the container joins docker's default bridge. Everything that talks to
+		// this node does so over the published port on 127.0.0.1 (the FSC nodes are host processes and
+		// forge runs on the host), so a dedicated network would be created, joined, and never used.
 	})
 	if err != nil {
 		return nil, errors.Wrap(err, "evm nwo: failed to create the besu container")

integration/nwo/token/evm/besu_deploy_test.go

@@ -38,23 +38,15 @@ func requireBesuTooling(t *testing.T) {
 	}
 }
 
-// startTestBesu boots a node on its own docker network and cleans both up afterwards.
+// startTestBesu boots a node and removes the container afterwards. There is no docker network to
+// create or clean up: the node is reached over its published port like everything else here.
 func startTestBesu(t *testing.T, name string, port int) *Besu {
 	t.Helper()
 	requireBesuTooling(t)
 
-	d, err := docker.GetInstance()
-	require.NoError(t, err)
-
-	networkID := name + "-net"
-	// A leftover network from an interrupted run would otherwise fail the create.
-	_ = exec.Command("docker", "network", "rm", networkID).Run()
-	require.NoError(t, d.CreateNetwork(networkID))
-	t.Cleanup(func() { _ = exec.Command("docker", "network", "rm", networkID).Run() })
-
 	_ = exec.Command("docker", "rm", "-f", name).Run()
 	node, err := StartBesu(context.Background(), BesuConfig{
-		NetworkID: networkID, Name: name, Port: port, StartTimeout: 3 * time.Minute,
+		Name: name, Port: port, StartTimeout: 3 * time.Minute,
 	})
 	require.NoError(t, err)
 	t.Cleanup(func() { _ = node.Stop(context.Background()) })

integration/nwo/token/evm/nwo.go

@@ -10,11 +10,11 @@ import (
 	"context"
 	"math/big"
 	"path/filepath"
+	"strconv"
 	"time"
 
 	math3 "github.com/IBM/mathlib"
 	api2 "github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
-	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/common/docker"
 	sfcnode "github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc/node"
 	"github.com/onsi/gomega"
 
@@ -79,8 +79,6 @@ type NetworkHandler struct {
 	// layer rather than the chain, so it is delegated rather than reimplemented. The backend it is
 	// given does nothing: namespace preparation on EVM is the contract deployment below.
 	materials *tfabric.NetworkHandler
-
-	networkID string
 }
 
 // noopBackend satisfies the fabric handler's backend so the token-level generation can be reused
@@ -221,21 +219,18 @@ func (p *NetworkHandler) startNode(tms *topology2.TMS) *Besu {
 	}
 
 	ctx := p.TokenPlatform.GetContext()
-	d, err := docker.GetInstance()
-	gomega.Expect(err).NotTo(gomega.HaveOccurred(), "docker is required to run an EVM network")
 
-	// One docker network per test network, named after its root directory so parallel runs do not
-	// collide. Creating it is idempotent from this handler's point of view: another platform may have
-	// created it already.
-	p.networkID = filepath.Base(ctx.RootDir())
-	_ = d.CreateNetwork(p.networkID)
+	// The container is named after the port it publishes rather than after the root directory. Every
+	// suite passes "./testdata", so a name derived from it is the same string for all of them: the two
+	// evm suites would fight over one container instead of getting one each. The reserved port is
+	// unique by construction, which is exactly the property the name needs.
+	port := int(ctx.ReservePort())
 
 	node, err := StartBesu(context.Background(), BesuConfig{
-		Image:     p.Image,
-		NetworkID: p.networkID,
-		Name:      "besu-" + p.networkID,
-		Port:      int(ctx.ReservePort()),
-		ChainID:   p.ChainID,
+		Image:   p.Image,
+		Name:    "besu-" + strconv.Itoa(port),
+		Port:    port,
+		ChainID: p.ChainID,
 	})
 	gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to start the EVM node")