[FAB-14324] unexport OrdererRootCAsByChain

Change-Id: I83b36c1a6a6eefd4592f482d8d8e1541c5bd7469
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

Author: sykesm

core/comm/connection.go

@@ -24,7 +24,7 @@ var commLogger = flogging.MustGetLogger("comm")
 type CredentialSupport struct {
 	mutex                 sync.RWMutex
 	appRootCAsByChain     map[string][][]byte
-	OrdererRootCAsByChain map[string][][]byte
+	ordererRootCAsByChain map[string][][]byte
 	ServerRootCAs         [][]byte
 	clientCert            tls.Certificate
 }
@@ -33,7 +33,7 @@ type CredentialSupport struct {
 func NewCredentialSupport() *CredentialSupport {
 	return &CredentialSupport{
 		appRootCAsByChain:     make(map[string][][]byte),
-		OrdererRootCAsByChain: make(map[string][][]byte),
+		ordererRootCAsByChain: make(map[string][][]byte),
 	}
 }
 
@@ -59,7 +59,7 @@ func (cs *CredentialSupport) GetDeliverServiceCredentials(channelID string) (cre
 	cs.mutex.RLock()
 	defer cs.mutex.RUnlock()
 
-	rootCACerts, exists := cs.OrdererRootCAsByChain[channelID]
+	rootCACerts, exists := cs.ordererRootCAsByChain[channelID]
 	if !exists {
 		commLogger.Errorf("Attempted to obtain root CA certs of an unknown channel: %s", channelID)
 		return nil, fmt.Errorf("didn't find any root CA certs for channel %s", channelID)
@@ -172,6 +172,6 @@ func (cs *CredentialSupport) BuildTrustedRootsForChain(cm channelconfig.Resource
 
 	cs.mutex.Lock()
 	cs.appRootCAsByChain[cid] = appRootCAs
-	cs.OrdererRootCAsByChain[cid] = ordererRootCAs
+	cs.ordererRootCAsByChain[cid] = ordererRootCAs
 	cs.mutex.Unlock()
 }

core/comm/connection_test.go

@@ -67,7 +67,7 @@ func loadRootCAs() [][]byte {
 func TestNewCredentialSupport(t *testing.T) {
 	expected := &CredentialSupport{
 		appRootCAsByChain:     make(map[string][][]byte),
-		OrdererRootCAsByChain: make(map[string][][]byte),
+		ordererRootCAsByChain: make(map[string][][]byte),
 	}
 	assert.Equal(t, expected, NewCredentialSupport())
 }
@@ -82,7 +82,7 @@ func TestCredentialSupport(t *testing.T) {
 
 	cs := &CredentialSupport{
 		appRootCAsByChain:     make(map[string][][]byte),
-		OrdererRootCAsByChain: make(map[string][][]byte),
+		ordererRootCAsByChain: make(map[string][][]byte),
 	}
 	cert := tls.Certificate{Certificate: [][]byte{}}
 	cs.SetClientCertificate(cert)
@@ -92,8 +92,8 @@ func TestCredentialSupport(t *testing.T) {
 	cs.appRootCAsByChain["channel1"] = [][]byte{rootCAs[0]}
 	cs.appRootCAsByChain["channel2"] = [][]byte{rootCAs[1]}
 	cs.appRootCAsByChain["channel3"] = [][]byte{rootCAs[2]}
-	cs.OrdererRootCAsByChain["channel1"] = [][]byte{rootCAs[3]}
-	cs.OrdererRootCAsByChain["channel2"] = [][]byte{rootCAs[4]}
+	cs.ordererRootCAsByChain["channel1"] = [][]byte{rootCAs[3]}
+	cs.ordererRootCAsByChain["channel2"] = [][]byte{rootCAs[4]}
 	cs.ServerRootCAs = [][]byte{rootCAs[5]}
 
 	creds, _ := cs.GetDeliverServiceCredentials("channel1")
@@ -192,13 +192,13 @@ func TestImpersonation(t *testing.T) {
 
 	cs := &CredentialSupport{
 		appRootCAsByChain:     make(map[string][][]byte),
-		OrdererRootCAsByChain: make(map[string][][]byte),
+		ordererRootCAsByChain: make(map[string][][]byte),
 	}
 	_, err := cs.GetDeliverServiceCredentials("C")
 	assert.Error(t, err)
 
-	cs.OrdererRootCAsByChain["A"] = [][]byte{osA.caCert}
-	cs.OrdererRootCAsByChain["B"] = [][]byte{osB.caCert}
+	cs.ordererRootCAsByChain["A"] = [][]byte{osA.caCert}
+	cs.ordererRootCAsByChain["B"] = [][]byte{osB.caCert}
 
 	var tests = []struct {
 		channel string