bug fix

Signed-off-by: Angelo De Caro <[email protected]>
hyperledger-labs · Nov 11, 2024 · 334cc6d · 334cc6d
1 parent a4070c5
commit 334cc6d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/integration/nwo/fabric/network/network_support.go b/integration/nwo/fabric/network/network_support.go
@@ -1545,8 +1545,8 @@ func (n *Network) GenerateOrdererConfig(o *topology.Orderer) {
 	}).Parse(n.Templates.OrdererTemplate())
 	Expect(err).NotTo(HaveOccurred())
 
-	// pw := gexec.NewPrefixedWriter(fmt.Sprintf("[%s#orderer.yaml] ", o.ID()), ginkgo.GinkgoWriter)
-	err = t.Execute(io.MultiWriter(orderer), n)
+	pw := gexec.NewPrefixedWriter(fmt.Sprintf("[%s#orderer.yaml] ", o.ID()), ginkgo.GinkgoWriter)
+	err = t.Execute(io.MultiWriter(orderer, pw), n)
 	Expect(err).NotTo(HaveOccurred())
 }
 

diff --git a/integration/nwo/fabric/topology/core_template.go b/integration/nwo/fabric/topology/core_template.go
@@ -291,7 +291,7 @@ fabric:
     ordering:
       numRetries: 3
       retryInterval: 3s
-      tlsEnabled: true
+      tlsEnabled: {{ TLSEnabled }}
     peers: {{ range Peers }}
       - address: {{ PeerAddress . "Listen" }}
         connectionTimeout: 10s        

diff --git a/platform/fabric/core/generic/committer/committer.go b/platform/fabric/core/generic/committer/committer.go
@@ -855,7 +855,7 @@ func (c *Committer) applyBundle(bundle *channelconfig.Bundle) error {
 	}
 	tlsClientSideAuth, isSet := c.ConfigService.OrderingTLSClientAuthRequired()
 	if !isSet {
-		tlsEnabled = c.ConfigService.TLSClientAuthRequired()
+		tlsClientSideAuth = c.ConfigService.TLSClientAuthRequired()
 	}
 	connectionTimeout := c.ConfigService.ClientConnTimeout()