[FAB-9685] Move IsDevMode to config and add tests

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

Author: sykesm

core/chaincode/chaincode_support.go

@@ -18,15 +18,12 @@ import (
 	"github.com/hyperledger/fabric/core/container/ccintf"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
 	"golang.org/x/net/context"
 )
 
 type key string
 
 const (
-	// DevModeUserRunsChaincode property allows user to run chaincode in development environment
-	DevModeUserRunsChaincode       string = "dev"
 	chaincodeStartupTimeoutDefault int    = 5000
 	peerAddressDefault             string = "0.0.0.0:7052"
 
@@ -435,10 +432,3 @@ func (cs *ChaincodeSupport) Execute(ctxt context.Context, cccid *ccprovider.CCCo
 
 	return ccresp, err
 }
-
-// IsDevMode returns true if the peer was configured with development-mode enabled
-func IsDevMode() bool {
-	mode := viper.GetString("chaincode.mode")
-
-	return mode == DevModeUserRunsChaincode
-}

core/chaincode/config.go

@@ -84,3 +84,15 @@ func getLogLevelFromViper(key string) string {
 
 	return levelString
 }
+
+// DevModeUserRunsChaincode enables chaincode execution in a development
+// environment
+const DevModeUserRunsChaincode string = "dev"
+
+// IsDevMode returns true if the peer was configured with development-mode
+// enabled.
+func IsDevMode() bool {
+	mode := viper.GetString("chaincode.mode")
+
+	return mode == DevModeUserRunsChaincode
+}

core/chaincode/config_test.go

@@ -84,6 +84,19 @@ func TestGlobalConfigInvalidLogLevel(t *testing.T) {
 	assert.Equal(t, "INFO", config.ShimLogLevel)
 }
 
+func TestIsDevMode(t *testing.T) {
+	cleanup := capture()
+	defer cleanup()
+
+	viper.Set("chaincode.mode", chaincode.DevModeUserRunsChaincode)
+	assert.True(t, chaincode.IsDevMode())
+
+	viper.Set("chaincode.mode", "empty")
+	assert.False(t, chaincode.IsDevMode())
+	viper.Set("chaincode.mode", "nonsense")
+	assert.False(t, chaincode.IsDevMode())
+}
+
 func capture() (restore func()) {
 	viper.SetEnvPrefix("CORE")
 	viper.AutomaticEnv()