FAB-9760 Remove unused prelaunch func

The Prelaunch field can never be set, and complicates our interfaces and
tests.  Removing.

Change-Id: I2cb316550104e8b33ba8abfa5b43dd3efb27b507
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>

Author: Jason Yellick

core/container/api/core.go

@@ -25,12 +25,11 @@ import (
 )
 
 type BuildSpecFactory func() (io.Reader, error)
-type PrelaunchFunc func() error
 
 //VM is an abstract virtual image for supporting arbitrary virual machines
 type VM interface {
 	Deploy(ctxt context.Context, ccid ccintf.CCID, args []string, env []string, reader io.Reader) error
-	Start(ctxt context.Context, ccid ccintf.CCID, args []string, env []string, filesToUpload map[string][]byte, builder BuildSpecFactory, preLaunchFunc PrelaunchFunc) error
+	Start(ctxt context.Context, ccid ccintf.CCID, args []string, env []string, filesToUpload map[string][]byte, builder BuildSpecFactory) error
 	Stop(ctxt context.Context, ccid ccintf.CCID, timeout uint, dontkill bool, dontremove bool) error
 	Destroy(ctxt context.Context, ccid ccintf.CCID, force bool, noprune bool) error
 	GetVMName(ccID ccintf.CCID, format func(string) (string, error)) (string, error)

core/container/controller.go

@@ -126,13 +126,12 @@ type StartContainerReq struct {
 	Args          []string
 	Env           []string
 	FilesToUpload map[string][]byte
-	PrelaunchFunc api.PrelaunchFunc
 }
 
 func (si StartContainerReq) do(ctxt context.Context, v api.VM) VMCResp {
 	var resp VMCResp
 
-	if err := v.Start(ctxt, si.CCID, si.Args, si.Env, si.FilesToUpload, si.Builder, si.PrelaunchFunc); err != nil {
+	if err := v.Start(ctxt, si.CCID, si.Args, si.Env, si.FilesToUpload, si.Builder); err != nil {
 		resp = VMCResp{Err: err}
 	} else {
 		resp = VMCResp{}

core/container/dockercontroller/dockercontroller.go

@@ -229,7 +229,7 @@ func (vm *DockerVM) Deploy(ctxt context.Context, ccid ccintf.CCID,
 
 //Start starts a container using a previously created docker image
 func (vm *DockerVM) Start(ctxt context.Context, ccid ccintf.CCID,
-	args []string, env []string, filesToUpload map[string][]byte, builder container.BuildSpecFactory, prelaunchFunc container.PrelaunchFunc) error {
+	args []string, env []string, filesToUpload map[string][]byte, builder container.BuildSpecFactory) error {
 	imageName, err := vm.GetVMName(ccid, formatImageName)
 	if err != nil {
 		return err
@@ -387,12 +387,6 @@ func (vm *DockerVM) Start(ctxt context.Context, ccid ccintf.CCID,
 		}
 	}
 
-	if prelaunchFunc != nil {
-		if err = prelaunchFunc(); err != nil {
-			return err
-		}
-	}
-
 	// start container with HostConfig was deprecated since v1.10 and removed in v1.2
 	err = client.StartContainer(containerName, nil)
 	if err != nil {

core/container/dockercontroller/dockercontroller_test.go

@@ -110,25 +110,25 @@ func Test_Start(t *testing.T) {
 	// case 1: getMockClient returns error
 	dvm.getClientFnc = getMockClient
 	getClientErr = true
-	err := dvm.Start(ctx, ccid, args, env, files, nil, nil)
+	err := dvm.Start(ctx, ccid, args, env, files, nil)
 	testerr(t, err, false)
 	getClientErr = false
 
 	// case 2: dockerClient.CreateContainer returns error
 	createErr = true
-	err = dvm.Start(ctx, ccid, args, env, files, nil, nil)
+	err = dvm.Start(ctx, ccid, args, env, files, nil)
 	testerr(t, err, false)
 	createErr = false
 
 	// case 3: dockerClient.UploadToContainer returns error
 	uploadErr = true
-	err = dvm.Start(ctx, ccid, args, env, files, nil, nil)
+	err = dvm.Start(ctx, ccid, args, env, files, nil)
 	testerr(t, err, false)
 	uploadErr = false
 
 	// case 4: dockerClient.StartContainer returns docker.noSuchImgErr
 	noSuchImgErr = true
-	err = dvm.Start(ctx, ccid, args, env, files, nil, nil)
+	err = dvm.Start(ctx, ccid, args, env, files, nil)
 	testerr(t, err, false)
 
 	chaincodePath := "github.com/hyperledger/fabric/examples/chaincode/go/example01/cmd"
@@ -146,53 +146,35 @@ func Test_Start(t *testing.T) {
 	// docker.noSuchImgErr and dockerClient.Start returns error
 	viper.Set("vm.docker.attachStdout", true)
 	startErr = true
-	err = dvm.Start(ctx, ccid, args, env, files, bldr, nil)
+	err = dvm.Start(ctx, ccid, args, env, files, bldr)
 	testerr(t, err, false)
 	startErr = false
 
 	// Success cases
-	err = dvm.Start(ctx, ccid, args, env, files, bldr, nil)
+	err = dvm.Start(ctx, ccid, args, env, files, bldr)
 	testerr(t, err, true)
 	noSuchImgErr = false
 
 	// dockerClient.StopContainer returns error
 	stopErr = true
-	err = dvm.Start(ctx, ccid, args, env, files, nil, nil)
+	err = dvm.Start(ctx, ccid, args, env, files, nil)
 	testerr(t, err, true)
 	stopErr = false
 
 	// dockerClient.KillContainer returns error
 	killErr = true
-	err = dvm.Start(ctx, ccid, args, env, files, nil, nil)
+	err = dvm.Start(ctx, ccid, args, env, files, nil)
 	testerr(t, err, true)
 	killErr = false
 
 	// dockerClient.RemoveContainer returns error
 	removeErr = true
-	err = dvm.Start(ctx, ccid, args, env, files, nil, nil)
+	err = dvm.Start(ctx, ccid, args, env, files, nil)
 	testerr(t, err, true)
 	removeErr = false
 
-	err = dvm.Start(ctx, ccid, args, env, files, nil, nil)
+	err = dvm.Start(ctx, ccid, args, env, files, nil)
 	testerr(t, err, true)
-
-	//test preLaunchFunc works correctly
-	preLaunchStr := "notset"
-	preLaunchFunc := func() error {
-		preLaunchStr = "set"
-		return nil
-	}
-
-	err = dvm.Start(ctx, ccid, args, env, files, nil, preLaunchFunc)
-	testerr(t, err, true)
-	assert.Equal(t, preLaunchStr, "set")
-
-	preLaunchFunc = func() error {
-		return fmt.Errorf("testing error path")
-	}
-
-	err = dvm.Start(ctx, ccid, args, env, files, nil, preLaunchFunc)
-	testerr(t, err, false)
 }
 
 func Test_Stop(t *testing.T) {

core/container/inproccontroller/inproccontroller.go

@@ -158,7 +158,7 @@ func (ipc *inprocContainer) launchInProc(ctxt context.Context, id string, args [
 }
 
 //Start starts a previously registered system codechain
-func (vm *InprocVM) Start(ctxt context.Context, ccid ccintf.CCID, args []string, env []string, filesToUpload map[string][]byte, builder container.BuildSpecFactory, prelaunchFunc container.PrelaunchFunc) error {
+func (vm *InprocVM) Start(ctxt context.Context, ccid ccintf.CCID, args []string, env []string, filesToUpload map[string][]byte, builder container.BuildSpecFactory) error {
 	path := ccid.ChaincodeSpec.ChaincodeId.Path
 
 	ipctemplate := typeRegistry[path]
@@ -186,12 +186,6 @@ func (vm *InprocVM) Start(ctxt context.Context, ccid ccintf.CCID, args []string,
 		return fmt.Errorf("in-process communication generator not supplied")
 	}
 
-	if prelaunchFunc != nil {
-		if err = prelaunchFunc(); err != nil {
-			return err
-		}
-	}
-
 	ipc.running = true
 
 	go func() {

core/container/inproccontroller/inproccontroller_test.go

@@ -463,7 +463,7 @@ func TestStart(t *testing.T) {
 
 	typeRegistry["path"] = ipc
 
-	err := vm.Start(mockContext, ccid, args, env, files, mockBuilder, nil)
+	err := vm.Start(mockContext, ccid, args, env, files, mockBuilder)
 	assert.Nil(t, err, "err should be nil")
 }