[FAB-9522] Remove TLSEnabled() from core/comm package

Removed the package scoped function and replaced the references with the underlying viper method. The performance difference between viper and the cached value is negligible.

Change-Id: Ib3e644cee74df60572e5159282a11db0e619512d
Signed-off-by: Brian Buchanan <bpbuch@gmail.com>

Author: Brian Buchanan

core/chaincode/shim/chaincode.go

@@ -80,7 +80,7 @@ var streamGetter peerStreamGetter
 //the non-mock user CC stream establishment func
 func userChaincodeStreamGetter(name string) (PeerChaincodeStream, error) {
 	flag.StringVar(&peerAddress, "peer.address", "", "peer address")
-	if comm.TLSEnabled() {
+	if viper.GetBool("peer.tls.enabled") {
 		keyPath := viper.GetString("tls.client.key.path")
 		certPath := viper.GetString("tls.client.cert.path")
 
@@ -254,7 +254,7 @@ func newPeerClientConnection() (*grpc.ClientConn, error) {
 		ClientInterval: time.Duration(1) * time.Minute,
 		ClientTimeout:  time.Duration(20) * time.Second,
 	}
-	if comm.TLSEnabled() {
+	if viper.GetBool("peer.tls.enabled") {
 		return comm.NewClientConnectionWithAddress(peerAddress, true, true,
 			comm.InitTLSForShim(key, cert), kaOpts)
 	}

core/comm/config.go

@@ -10,16 +10,11 @@ import (
 	"crypto/tls"
 	"time"
 
-	"github.com/spf13/viper"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/keepalive"
 )
 
 var (
-	// Is the configuration cached?
-	configurationCached = false
-	// Is TLS enabled
-	tlsEnabled bool
 	// Max send and receive bytes for grpc clients and servers
 	MaxRecvMsgSize = 100 * 1024 * 1024
 	MaxSendMsgSize = 100 * 1024 * 1024
@@ -107,22 +102,6 @@ type KeepaliveOptions struct {
 	ServerMinInterval time.Duration
 }
 
-// cacheConfiguration caches common package scoped variables
-func cacheConfiguration() {
-	if !configurationCached {
-		tlsEnabled = viper.GetBool("peer.tls.enabled")
-		configurationCached = true
-	}
-}
-
-// TLSEnabled return cached value for "peer.tls.enabled" configuration value
-func TLSEnabled() bool {
-	if !configurationCached {
-		cacheConfiguration()
-	}
-	return tlsEnabled
-}
-
 // DefaultKeepaliveOptions returns sane default keepalive settings for gRPC
 // servers and clients
 func DefaultKeepaliveOptions() *KeepaliveOptions {

core/comm/config_test.go

@@ -9,25 +9,11 @@ package comm
 import (
 	"testing"
 
-	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestConfig(t *testing.T) {
 	t.Parallel()
 	// check the defaults
 	assert.EqualValues(t, keepaliveOptions, DefaultKeepaliveOptions())
-	assert.EqualValues(t, false, TLSEnabled())
-	assert.EqualValues(t, true, configurationCached)
-
-	// reset cache
-	configurationCached = false
-	viper.Set("peer.tls.enabled", true)
-	assert.EqualValues(t, true, TLSEnabled())
-	// check that value is cached
-	viper.Set("peer.tls.enabled", false)
-	assert.NotEqual(t, false, TLSEnabled())
-	// reset tls
-	configurationCached = false
-	viper.Set("peer.tls.enabled", false)
 }

core/deliverservice/deliveryclient.go

@@ -215,7 +215,7 @@ func (d *deliverServiceImpl) Stop() {
 
 func (d *deliverServiceImpl) newClient(chainID string, ledgerInfoProvider blocksprovider.LedgerInfo) *broadcastClient {
 	requester := &blocksRequester{
-		tls:     comm.TLSEnabled(),
+		tls:     viper.GetBool("peer.tls.enabled"),
 		chainID: chainID,
 	}
 	broadcastSetup := func(bd blocksprovider.BlocksDeliverer) error {
@@ -253,7 +253,7 @@ func DefaultConnectionFactory(channelID string) func(endpoint string) (*grpc.Cli
 		}
 		dialOpts = append(dialOpts, comm.ClientKeepaliveOptions(kaOpts)...)
 
-		if comm.TLSEnabled() {
+		if viper.GetBool("peer.tls.enabled") {
 			creds, err := comm.GetCredentialSupport().GetDeliverServiceCredentials(channelID)
 			if err != nil {
 				return nil, fmt.Errorf("Failed obtaining credentials for channel %s: %v", channelID, err)

peer/node/start.go

@@ -280,7 +280,7 @@ func serve(args []string) error {
 		}
 		dialOpts = append(dialOpts, comm.ClientKeepaliveOptions(kaOpts)...)
 
-		if comm.TLSEnabled() {
+		if viper.GetBool("peer.tls.enabled") {
 			dialOpts = append(dialOpts, grpc.WithTransportCredentials(comm.GetCredentialSupport().GetPeerCredentials()))
 		} else {
 			dialOpts = append(dialOpts, grpc.WithInsecure())