Converge deployment spec validation

We currently had two competing deployment-spec import utilities.
One only performed bare minimum validation while the other
utilized the platform driver for full validation.  Let's
consolidate them.

Change-Id: I7d43139c3e5928b2af229cb51ece9e49d0159f13
Signed-off-by: Gregory Haskins <[email protected]>

Author: ghaskins

core/scc/lccc/lccc.go

@@ -251,18 +251,6 @@ func (lccc *LifeCycleSysCC) getChaincode(stub shim.ChaincodeStubInterface, ccnam
 	return nil, nil, NotFoundErr(ccname)
 }
 
-//getChaincodeDeploymentSpec returns a ChaincodeDeploymentSpec given args
-func (lccc *LifeCycleSysCC) getChaincodeDeploymentSpec(code []byte) (*pb.ChaincodeDeploymentSpec, error) {
-	cds := &pb.ChaincodeDeploymentSpec{}
-
-	err := proto.Unmarshal(code, cds)
-	if err != nil {
-		return nil, InvalidDeploymentSpecErr(err.Error())
-	}
-
-	return cds, nil
-}
-
 // getChaincodes returns all chaincodes instantiated on this LCCC's channel
 func (lccc *LifeCycleSysCC) getChaincodes(stub shim.ChaincodeStubInterface) pb.Response {
 	// get all rows from LCCC
@@ -343,7 +331,7 @@ func (lccc *LifeCycleSysCC) isValidChaincodeName(chaincodename string) bool {
 
 //this implements "install" Invoke transaction
 func (lccc *LifeCycleSysCC) executeInstall(stub shim.ChaincodeStubInterface, depSpec []byte) error {
-	cds, err := lccc.getChaincodeDeploymentSpec(depSpec)
+	cds, err := utils.GetChaincodeDeploymentSpec(depSpec)
 
 	if err != nil {
 		return err
@@ -366,7 +354,7 @@ func (lccc *LifeCycleSysCC) executeInstall(stub shim.ChaincodeStubInterface, dep
 
 //this implements "deploy" Invoke transaction
 func (lccc *LifeCycleSysCC) executeDeploy(stub shim.ChaincodeStubInterface, chainname string, depSpec []byte, policy []byte, escc []byte, vscc []byte) error {
-	cds, err := lccc.getChaincodeDeploymentSpec(depSpec)
+	cds, err := utils.GetChaincodeDeploymentSpec(depSpec)
 
 	if err != nil {
 		return err
@@ -420,7 +408,7 @@ func (lccc *LifeCycleSysCC) getUpgradeVersion(cd *ccprovider.ChaincodeData, cds
 
 //this implements "upgrade" Invoke transaction
 func (lccc *LifeCycleSysCC) executeUpgrade(stub shim.ChaincodeStubInterface, chainName string, depSpec []byte, policy []byte, escc []byte, vscc []byte) ([]byte, error) {
-	cds, err := lccc.getChaincodeDeploymentSpec(depSpec)
+	cds, err := utils.GetChaincodeDeploymentSpec(depSpec)
 	if err != nil {
 		return nil, err
 	}

core/scc/lccc/lccc_test.go

@@ -26,6 +26,11 @@ import (
 	"github.com/hyperledger/fabric/core/common/ccprovider"
 	"github.com/hyperledger/fabric/core/common/sysccprovider"
 	//"github.com/hyperledger/fabric/core/container"
+	"archive/tar"
+	"bytes"
+	"compress/gzip"
+
+	"github.com/hyperledger/fabric/core/container/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 )
 
@@ -56,9 +61,19 @@ func register(stub *shim.MockStub, ccname string) error {
 func constructDeploymentSpec(name string, path string, version string, initArgs [][]byte, createFS bool) (*pb.ChaincodeDeploymentSpec, error) {
 	spec := &pb.ChaincodeSpec{Type: 1, ChaincodeId: &pb.ChaincodeID{Name: name, Path: path, Version: version}, Input: &pb.ChaincodeInput{Args: initArgs}}
 
-	codePackageBytes := []byte(name + path + version)
+	codePackageBytes := bytes.NewBuffer(nil)
+	gz := gzip.NewWriter(codePackageBytes)
+	tw := tar.NewWriter(gz)
+
+	err := util.WriteBytesToPackage("src/garbage.go", []byte(name+path+version), tw)
+	if err != nil {
+		return nil, err
+	}
+
+	tw.Close()
+	gz.Close()
 
-	chaincodeDeploymentSpec := &pb.ChaincodeDeploymentSpec{ChaincodeSpec: spec, CodePackage: codePackageBytes}
+	chaincodeDeploymentSpec := &pb.ChaincodeDeploymentSpec{ChaincodeSpec: spec, CodePackage: codePackageBytes.Bytes()}
 
 	if createFS {
 		err := ccprovider.PutChaincodeIntoFS(chaincodeDeploymentSpec)
@@ -182,9 +197,8 @@ func TestInvalidCodeDeploy(t *testing.T) {
 	baddepspec := []byte("bad deploy spec")
 	args := [][]byte{[]byte(DEPLOY), []byte("test"), baddepspec}
 	res := stub.MockInvoke("1", args)
-	expectErr := InvalidDeploymentSpecErr("unexpected EOF")
-	if string(res.Message) != expectErr.Error() {
-		t.Logf("get result: %+v", res)
+	if res.Status == shim.OK {
+		t.Logf("Expected failure")
 		t.FailNow()
 	}
 }