FAB-1926 add version field to chaincode ID

https://jira.hyperledger.org/browse/FAB-1926

Adds version to chaincode ID proto specification and uses it in the
installer.

Change-Id: If9f3fa7c6c5661b73a9aacbc2b74a0d2b39adf7f
Signed-off-by: Srinivasan Muralidharan <[email protected]>

Author: Srinivasan Muralidharan

peer/chaincode/common.go

@@ -86,7 +86,7 @@ func getChaincodeSpecification(cmd *cobra.Command) (*pb.ChaincodeSpec, error) {
 	chaincodeLang = strings.ToUpper(chaincodeLang)
 	spec = &pb.ChaincodeSpec{
 		Type:        pb.ChaincodeSpec_Type(pb.ChaincodeSpec_Type_value[chaincodeLang]),
-		ChaincodeID: &pb.ChaincodeID{Path: chaincodePath, Name: chaincodeName},
+		ChaincodeID: &pb.ChaincodeID{Path: chaincodePath, Name: chaincodeName, Version: chaincodeVersion},
 		Input:       input,
 	}
 	return spec, nil

peer/chaincode/install.go

@@ -67,6 +67,12 @@ func createCCInstallPath(path string) (string, error) {
 
 func packageCC(chaincodeBin []byte) ([]byte, error) {
 	//TODO create proper, secured package, for now return chaincode binary asis
+	//
+	//At minimum, the package will contain
+	//  . chaincodeBin
+	//  . serialized Policy
+	//  . hash of the above computed here at install time
+	//  . signature with above
 	return chaincodeBin, nil
 }
 

peer/chaincode/install_test.go

@@ -75,6 +75,21 @@ func TestInstallCmd(t *testing.T) {
 	}
 }
 
+// TestBadVersion tests generation of install command
+func TestBadVersion(t *testing.T) {
+	fsPath := "/tmp/installtest"
+
+	cmd := initInstallTest(fsPath, t)
+	defer finitInstallTest(fsPath)
+
+	args := []string{"-n", "example02", "-p", "github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02"}
+	cmd.SetArgs(args)
+
+	if err := cmd.Execute(); err == nil {
+		t.Fatalf("Expected error executing install command for version not specified")
+	}
+}
+
 // TestNonExistentCC non existent chaincode should fail as expected
 func TestNonExistentCC(t *testing.T) {
 	fsPath := "/tmp/installtest"

protos/peer/chaincode.pb.go

@@ -44,6 +44,9 @@ message ChaincodeID {
     //all other requests will use the name (really a hashcode) generated by
     //the deploy transaction
     string name = 2;
+
+    //user friendly version name for the chaincode
+    string version = 3;
 }
 
 // Carries the chaincode function and its arguments.