[FAB-3666] Update chaincode.deploytimeout to duration

This CR updates the chaincode deploy timeout from an integer to a time
duration. This has been done for consistency with other timeouts defined
for the peer and orderer.

Change-Id: Ib70c478e3d260cb988b862f1a448eedde963be2a
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

core/chaincode/platforms/golang/package.go

@@ -113,6 +113,13 @@ func getCodeFromHTTP(path string) (codegopath string, err error) {
 		done <- cmd.Wait()
 	}()
 
+	ccDeployTimeout := viper.GetDuration("chaincode.deploytimeout")
+	if ccDeployTimeout < time.Duration(30)*time.Second {
+		logger.Warningf("Invalid chaincode deploy timeout value %s (should be at least 30s); defaulting to 30s", ccDeployTimeout)
+		ccDeployTimeout = time.Duration(30) * time.Second
+	} else {
+		logger.Debugf("Setting chaincode deploy timeout to %s", ccDeployTimeout)
+	}
 	select {
 	case <-time.After(time.Duration(viper.GetInt("chaincode.deploytimeout")) * time.Millisecond):
 		// If pulling repos takes too long, we should give up

sampleconfig/core.yaml

@@ -306,8 +306,8 @@ chaincode:
     # system chaincodes. Default is 30 seconds
     executetimeout: 30s
 
-    #timeout in millisecs for deploying chaincode from a remote repository.
-    deploytimeout: 30000
+    #timeout duration for deploying chaincode from a remote repository.
+    deploytimeout: 30s
 
     #mode - options are "dev", "net"
     #dev - in dev mode, user runs the chaincode after starting validator from