FAB-9603 Remove dead code from core/container

This is a bunch of cruft from v0.5/v0.6 particularly in the chaincode
space.  This is unneeded code.  Since it is a burden to maintain, and
(because it is unused) poorly maintained, it should be removed.

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

Author: Jason Yellick

core/chaincode/exectransaction_test.go

@@ -35,7 +35,6 @@ import (
 	"github.com/hyperledger/fabric/core/common/ccprovider"
 	"github.com/hyperledger/fabric/core/config"
 	"github.com/hyperledger/fabric/core/container"
-	"github.com/hyperledger/fabric/core/container/ccintf"
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/core/ledger/ledgerconfig"
 	"github.com/hyperledger/fabric/core/ledger/ledgermgmt"
@@ -537,7 +536,7 @@ func checkFinalState(cccid *ccprovider.CCContext, a int, b int) error {
 }
 
 // Invoke chaincode_example02
-func invokeExample02Transaction(ctxt context.Context, cccid *ccprovider.CCContext, cID *pb.ChaincodeID, chaincodeType pb.ChaincodeSpec_Type, args []string, destroyImage bool, chaincodeSupport *ChaincodeSupport) error {
+func invokeExample02Transaction(ctxt context.Context, cccid *ccprovider.CCContext, cID *pb.ChaincodeID, chaincodeType pb.ChaincodeSpec_Type, args []string, chaincodeSupport *ChaincodeSupport) error {
 	// the ledger is created with genesis block. Start block number 1 onwards
 	var nextBlockNumber uint64 = 1
 	f := "init"
@@ -552,25 +551,6 @@ func invokeExample02Transaction(ctxt context.Context, cccid *ccprovider.CCContex
 
 	time.Sleep(time.Second)
 
-	if destroyImage {
-		chaincodeSupport.Stop(ctxt, cccid, &pb.ChaincodeDeploymentSpec{ChaincodeSpec: spec})
-		dir := container.DestroyImageReq{
-			CCID: ccintf.CCID{
-				ChaincodeSpec: spec,
-				// NetworkID:     chaincodeSupport.peerNetworkID,
-				// PeerID:        chaincodeSupport.peerID,
-			},
-			Force:   true,
-			NoPrune: true,
-		}
-
-		_, err = container.VMCProcess(ctxt, container.DOCKER, dir)
-		if err != nil {
-			err = fmt.Errorf("Error destroying image: %s", err)
-			return err
-		}
-	}
-
 	f = "invoke"
 	invokeArgs := append([]string{f}, args...)
 	spec = &pb.ChaincodeSpec{ChaincodeId: cID, Input: &pb.ChaincodeInput{Args: util.ToChaincodeArgs(invokeArgs...)}}
@@ -786,7 +766,7 @@ func TestExecuteInvokeTransaction(t *testing.T) {
 			ccID := &pb.ChaincodeID{Name: chaincodeName, Path: tc.chaincodePath, Version: chaincodeVersion}
 
 			args := []string{"a", "b", "10"}
-			err = invokeExample02Transaction(ctxt, cccid, ccID, tc.chaincodeType, args, true, chaincodeSupport)
+			err = invokeExample02Transaction(ctxt, cccid, ccID, tc.chaincodeType, args, chaincodeSupport)
 			if err != nil {
 				t.Fail()
 				t.Logf("Error invoking transaction: %s", err)
@@ -825,7 +805,7 @@ func TestExecuteInvokeInvalidTransaction(t *testing.T) {
 
 	//FAIL, FAIL!
 	args := []string{"x", "-1"}
-	err = invokeExample02Transaction(ctxt, cccid, ccID, pb.ChaincodeSpec_GOLANG, args, false, chaincodeSupport)
+	err = invokeExample02Transaction(ctxt, cccid, ccID, pb.ChaincodeSpec_GOLANG, args, chaincodeSupport)
 
 	//this HAS to fail with expectedDeltaStringPrefix
 	if err != nil {

core/chaincode/multichains_test.go

@@ -45,7 +45,7 @@ func TestExecuteInvokeOnManyChains(t *testing.T) {
 	args := []string{"a", "b", "10"}
 	for _, c := range chains {
 		cccid := ccprovider.NewCCContext(c, "example02", "0", "", false, nil, nil)
-		err = invokeExample02Transaction(ctxt, cccid, chaincodeID, pb.ChaincodeSpec_GOLANG, args, false, chaincodeSupport)
+		err = invokeExample02Transaction(ctxt, cccid, chaincodeID, pb.ChaincodeSpec_GOLANG, args, chaincodeSupport)
 		if err != nil {
 			t.Fail()
 			t.Logf("Error invoking transaction: %s", err)

core/container/controller.go

@@ -1,24 +1,13 @@
 /*
-Copyright IBM Corp. 2016 All Rights Reserved.
+Copyright IBM Corp. All Rights Reserved.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-		 http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+SPDX-License-Identifier: Apache-2.0
 */
 
 package container
 
 import (
 	"fmt"
-	"io"
 	"sync"
 
 	"golang.org/x/net/context"
@@ -44,21 +33,16 @@ type VMController struct {
 	containerLocks map[string]*refCountedLock
 }
 
-//singleton...acess through NewVMController
-var vmcontroller *VMController
+var vmcontroller = &VMController{
+	containerLocks: make(map[string]*refCountedLock),
+}
 
 //constants for supported containers
 const (
 	DOCKER = "Docker"
 	SYSTEM = "System"
 )
 
-//NewVMController - creates/returns singleton
-func init() {
-	vmcontroller = new(VMController)
-	vmcontroller.containerLocks = make(map[string]*refCountedLock)
-}
-
 func (vmc *VMController) newVM(typ string) api.VM {
 	var v api.VM
 
@@ -68,7 +52,7 @@ func (vmc *VMController) newVM(typ string) api.VM {
 	case SYSTEM:
 		v = &inproccontroller.InprocVM{}
 	default:
-		v = &dockercontroller.DockerVM{}
+		vmLogger.Panicf("Programming error: unsupported VM type: %s", typ)
 	}
 	return v
 }
@@ -124,30 +108,6 @@ type VMCResp struct {
 	Resp interface{}
 }
 
-//CreateImageReq - properties for creating an container image
-type CreateImageReq struct {
-	ccintf.CCID
-	Reader io.Reader
-	Args   []string
-	Env    []string
-}
-
-func (bp CreateImageReq) do(ctxt context.Context, v api.VM) VMCResp {
-	var resp VMCResp
-
-	if err := v.Deploy(ctxt, bp.CCID, bp.Args, bp.Env, bp.Reader); err != nil {
-		resp = VMCResp{Err: err}
-	} else {
-		resp = VMCResp{}
-	}
-
-	return resp
-}
-
-func (bp CreateImageReq) getCCID() ccintf.CCID {
-	return bp.CCID
-}
-
 //StartContainerReq - properties for starting a container.
 type StartContainerReq struct {
 	ccintf.CCID
@@ -200,30 +160,6 @@ func (si StopContainerReq) getCCID() ccintf.CCID {
 	return si.CCID
 }
 
-//DestroyImageReq - properties for stopping a container.
-type DestroyImageReq struct {
-	ccintf.CCID
-	Timeout uint
-	Force   bool
-	NoPrune bool
-}
-
-func (di DestroyImageReq) do(ctxt context.Context, v api.VM) VMCResp {
-	var resp VMCResp
-
-	if err := v.Destroy(ctxt, di.CCID, di.Force, di.NoPrune); err != nil {
-		resp = VMCResp{Err: err}
-	} else {
-		resp = VMCResp{}
-	}
-
-	return resp
-}
-
-func (di DestroyImageReq) getCCID() ccintf.CCID {
-	return di.CCID
-}
-
 //VMCProcess should be used as follows
 //   . construct a context
 //   . construct req of the right type (e.g., CreateImageReq)

core/container/controller_test.go

@@ -26,6 +26,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hyperledger/fabric/core/container/api"
 	"github.com/hyperledger/fabric/core/container/ccintf"
 	"github.com/hyperledger/fabric/core/container/dockercontroller"
 	"github.com/hyperledger/fabric/core/container/inproccontroller"
@@ -125,45 +126,59 @@ func getCodeChainBytesInMem() (io.Reader, error) {
 	return inputbuf, nil
 }
 
-//set to true by providing "-run-controller-tests" command line option... Tests will create a docker image called "simple"
-var runTests bool
+//CreateImageReq - properties for creating an container image
+type CreateImageReq struct {
+	ccintf.CCID
+	Reader io.Reader
+	Args   []string
+	Env    []string
+}
 
-func testForSkip(t *testing.T) {
-	//run tests
-	if !runTests {
-		t.SkipNow()
+func (bp CreateImageReq) do(ctxt context.Context, v api.VM) VMCResp {
+	var resp VMCResp
+	if err := v.Deploy(ctxt, bp.CCID, bp.Args, bp.Env, bp.Reader); err != nil {
+		resp = VMCResp{Err: err}
+	} else {
+		resp = VMCResp{}
 	}
+	return resp
+}
+func (bp CreateImageReq) getCCID() ccintf.CCID {
+	return bp.CCID
 }
 
-func TestVMCBuildImage(t *testing.T) {
-	testForSkip(t)
+func createImage() {
 	var ctxt = context.Background()
-
 	//get the tarball for codechain
 	tarRdr, err := getCodeChainBytesInMem()
 	if err != nil {
-		t.Fail()
-		t.Logf("Error reading tar file: %s", err)
-		return
+		panic(err)
 	}
 
-	c := make(chan struct{})
+	//create a the image needed for the rest of the tests obj and send it to VMCProcess
+	cir := CreateImageReq{CCID: ccintf.CCID{ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "simple"}}}, Reader: tarRdr}
+	resp, err := VMCProcess(ctxt, "Docker", cir)
+	eResp := VMCResp{}
+	if err != nil || resp != eResp {
+		panic(fmt.Sprintf("err: %s, resp: %s", err, resp))
+	}
+}
 
-	//creat a CreateImageReq obj and send it to VMCProcess
-	go func() {
-		defer close(c)
-		cir := CreateImageReq{CCID: ccintf.CCID{ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "simple"}}}, Reader: tarRdr}
-		_, err := VMCProcess(ctxt, "Docker", cir)
-		if err != nil {
-			t.Fail()
-			t.Logf("Error creating image: %s", err)
-			return
-		}
-	}()
+//set to true by providing "-run-controller-tests" command line option... Tests will create a docker image called "simple"
+var runTests bool
 
-	//wait for VMController to complete.
-	fmt.Println("VMCBuildImage-waiting for response")
-	<-c
+// tests will fail if we don't build an image to start and stop, so check to see if this has been done
+var imageCreated bool
+
+func testForSkip(t *testing.T) {
+	if !imageCreated {
+		createImage()
+	}
+
+	//run tests
+	if !runTests {
+		t.SkipNow()
+	}
 }
 
 func TestVMCStartContainer(t *testing.T) {
@@ -278,7 +293,5 @@ func TestNewVM(t *testing.T) {
 	ivm := vm.(*inproccontroller.InprocVM)
 	assert.NotNil(t, ivm, "Requested System VM but newVM did not return inproccontroller.InprocVM")
 
-	vm = vmcontroller.newVM("")
-	dvm = vm.(*dockercontroller.DockerVM)
-	assert.NotNil(t, dvm, "Requested default VM but newVM did not return dockercontroller.DockerVM")
+	assert.Panics(t, func() { vmcontroller.newVM("") }, "Requested unknown VM but did not panic")
 }