testing(nwo/fabric-x): fix multi-orderer endpoint injection in mock container

The mock orderer test container only launches a single orderer process
that listens on a single port for the entire mock cluster. This
commit reverts the container configuration to bind only one port,
and updates the configtx template generator to inject that single port
for all orderer endpoints in the genesis block. This ensures that the
fabric-smart-client broadcast service can successfully route transactions
to the simulated multi-orderer cluster without hitting closed ports.

Signed-off-by: Shashank <yshashank959@gmail.com>

Author: Rozerxshashank

integration/nwo/fabric/topology/configtx_template.go

@@ -112,8 +112,13 @@ Organizations:{{ range .PeerOrgs }}
       Rule: OR('{{.MSPID}}.admin')
   {{- end }}
   OrdererEndpoints:{{ range $w.OrderersInOrg .Name }}
+  {{- if eq $w.Consensus.Type "arma" }}
+  {{- $firstOrderer := index $.Orderers 0 }}
+  - {{ $w.OrdererHost . }}:{{ $w.OrdererPort $firstOrderer "Listen" }}
+  {{- else }}
   - {{ $w.OrdererAddress . "Listen" }}
   {{- end }}
+  {{- end }}
 {{ end }}
 
 Channel: &ChannelDefaults
@@ -201,13 +206,15 @@ Profiles:{{ range .Profiles }}
         {{- end }}{{- end }}
       {{- end }}
       {{- if eq $w.Consensus.Type "arma" }}
+      {{- $firstOrdererName := index .Orderers 0 }}
+      {{- $firstOrderer := $w.Orderer $firstOrdererName }}
       ConsenterMapping:{{ range $index, $orderer := .Orderers }}{{ with $w.Orderer . }}
       - ID: {{ .Id }}
         Host: 127.0.0.1
-        Port: {{ $w.OrdererPort . "Cluster" }}
+        Port: {{ $w.OrdererPort $firstOrderer "Listen" }}
         MSPID: {{ ($w.Organization .Organization).MSPID}}
-        ClientTLSCert: {{ $w.OrdererLocalCryptoDir . "tls" }}/server.crt
-        ServerTLSCert: {{ $w.OrdererLocalCryptoDir . "tls" }}/server.crt
+        ClientTLSCert: {{ $w.OrdererLocalCryptoDir $firstOrderer "tls" }}/server.crt
+        ServerTLSCert: {{ $w.OrdererLocalCryptoDir $firstOrderer "tls" }}/server.crt
         Identity: {{ $w.OrdererSignCert .}}
         {{- end }}{{- end }}
       {{- end }}

integration/nwo/fabricx/extensions/scv2/container.go

@@ -19,7 +19,6 @@ import (
 	"path/filepath"
 	"runtime"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/moby/moby/api/types/container"
@@ -50,14 +49,7 @@ func (e *Extension) launchContainer() {
 	// get ports
 	sidecarPort := int(e.network.PeerPort(sidecarPeer, fabric_network.ListenPort))
 	queryServicePort := int(e.network.PeerPort(sidecarPeer, fabricx_network.QueryServicePortName))
-
-	var orderingServicePorts []int
-	var orderingServiceEndpoints []string
-	for _, o := range e.network.Orderers {
-		port := int(e.network.OrdererPort(o, fabric_network.ListenPort))
-		orderingServicePorts = append(orderingServicePorts, port)
-		orderingServiceEndpoints = append(orderingServiceEndpoints, net.JoinHostPort("", strconv.Itoa(port)))
-	}
+	orderingServicePort := int(e.network.OrdererPort(e.network.Orderers[0], fabric_network.ListenPort))
 
 	// genesis block
 	configBlockPath := e.network.OutputBlockPath(e.channel.Name)
@@ -85,7 +77,7 @@ func (e *Extension) launchContainer() {
 		SidecarMSPID:          fmt.Sprintf("%sMSP", e.cfg.SidecarOrg),
 		SidecarServerEndpoint: net.JoinHostPort("", strconv.Itoa(sidecarPort)),
 		QueryServerEndpoint:   net.JoinHostPort("", strconv.Itoa(queryServicePort)),
-		OrdererServerEndpoint: strings.Join(orderingServiceEndpoints, ","),
+		OrdererServerEndpoint: net.JoinHostPort("", strconv.Itoa(orderingServicePort)),
 		TLSEnabled:            e.network.TLSEnabled,
 		CertsBundle:           path.Join("/root/artifacts/crypto", "ca-certs.pem"),
 		SidecarTLSDir:         containerSidecarTLSDir(e.network, sidecarPeer),
@@ -94,13 +86,9 @@ func (e *Extension) launchContainer() {
 		EnvVarOverrides:       e.cfg.EnvVars,
 	}
 
-	logger.Infof("Run fabric-x committer test container on %v ports: sidecar=%v query=%v orderers=%v",
-		localIP, sidecarPort, queryServicePort, orderingServicePorts)
+	logger.Infof("Run fabric-x committer test container on %v ports: sidecar=%v query=%v orderer=%v",
+		localIP, sidecarPort, queryServicePort, orderingServicePort)
 
-	var exposedPorts []int
-	exposedPorts = append(exposedPorts, sidecarPort, queryServicePort)
-	exposedPorts = append(exposedPorts, orderingServicePorts...)
-	
 	cli := utils.MustGet(dcli.New(dcli.FromEnv))
 	ctx := context.TODO()
 	resp := utils.MustGet(cli.ContainerCreate(
@@ -112,7 +100,7 @@ func (e *Extension) launchContainer() {
 				Tty:          true,
 				AttachStdout: true,
 				AttachStderr: true,
-				ExposedPorts: docker.PortSet(exposedPorts...),
+				ExposedPorts: docker.PortSet(sidecarPort, queryServicePort, orderingServicePort),
 				Env:          containerEnvVars(cfg),
 				Cmd:          containerCmd(cfg),
 			},
@@ -138,7 +126,7 @@ func (e *Extension) launchContainer() {
 						ReadOnly: true,
 					},
 				},
-				PortBindings: docker.PortBindings(exposedPorts...),
+				PortBindings: docker.PortBindings(sidecarPort, queryServicePort, orderingServicePort),
 			},
 			NetworkingConfig: &network.NetworkingConfig{
 				EndpointsConfig: map[string]*network.EndpointSettings{
@@ -207,7 +195,7 @@ func (e *Extension) launchContainer() {
 
 	// let's wait until the sidecar is ready
 	g, ctx := errgroup.WithContext(ctx)
-	for _, p := range exposedPorts {
+	for _, p := range []int{sidecarPort, orderingServicePort, queryServicePort} {
 		g.Go(func() error {
 			addr := net.JoinHostPort("127.0.0.1", strconv.Itoa(p))
 			return fabric.WaitUntilReadyWithTLS(ctx, addr, tlsConfig)