[FAB-5663] remove import from example04 and 05

Govendoring dependencies in these examples caused lot more
trouble than was worth (such as goimports failures on
vendored files). As the offending "util" import was just
to use a simple function, just implemented the function
in the samples and removed the import.

Change-Id: Ie471cdcd307ae8d328134fe88037fa1afbd0e078
Signed-off-by: Srinivasan Muralidharan <srinivasan.muralidharan99@gmail.com>

Author: muralisrini

examples/chaincode/go/chaincode_example04/chaincode_example04.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/chaincode/shim"
 	pb "github.com/hyperledger/fabric/protos/peer"
 )
@@ -31,6 +30,14 @@ import (
 type SimpleChaincode struct {
 }
 
+func toChaincodeArgs(args ...string) [][]byte {
+	bargs := make([][]byte, len(args))
+	for i, arg := range args {
+		bargs[i] = []byte(arg)
+	}
+	return bargs
+}
+
 // Init takes two arguments, a string and int. These are stored in the key/value pair in the state
 func (t *SimpleChaincode) Init(stub shim.ChaincodeStubInterface) pb.Response {
 	var event string // Indicates whether event has happened. Initially 0
@@ -84,7 +91,7 @@ func (t *SimpleChaincode) invoke(stub shim.ChaincodeStubInterface, args []string
 	}
 
 	f := "invoke"
-	invokeArgs := util.ToChaincodeArgs(f, "a", "b", "10")
+	invokeArgs := toChaincodeArgs(f, "a", "b", "10")
 	response := stub.InvokeChaincode(chainCodeToCall, invokeArgs, channelID)
 	if response.Status != shim.OK {
 		errStr := fmt.Sprintf("Failed to invoke chaincode. Got error: %s", string(response.Payload))
@@ -131,7 +138,7 @@ func (t *SimpleChaincode) query(stub shim.ChaincodeStubInterface, args []string)
 		queryKey := args[2]
 		channel := args[3]
 		f := "query"
-		invokeArgs := util.ToChaincodeArgs(f, queryKey)
+		invokeArgs := toChaincodeArgs(f, queryKey)
 		response := stub.InvokeChaincode(chainCodeToCall, invokeArgs, channel)
 		if response.Status != shim.OK {
 			errStr := fmt.Sprintf("Failed to invoke chaincode. Got error: %s", err.Error())

examples/chaincode/go/chaincode_example05/chaincode_example05.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/chaincode/shim"
 	pb "github.com/hyperledger/fabric/protos/peer"
 )
@@ -31,6 +30,14 @@ import (
 type SimpleChaincode struct {
 }
 
+func toChaincodeArgs(args ...string) [][]byte {
+	bargs := make([][]byte, len(args))
+	for i, arg := range args {
+		bargs[i] = []byte(arg)
+	}
+	return bargs
+}
+
 // Init takes two arguments, a string and int. The string will be a key with
 // the int as a value.
 func (t *SimpleChaincode) Init(stub shim.ChaincodeStubInterface) pb.Response {
@@ -80,7 +87,7 @@ func (t *SimpleChaincode) invoke(stub shim.ChaincodeStubInterface, args []string
 
 	// Query chaincode_example02
 	f := "query"
-	queryArgs := util.ToChaincodeArgs(f, "a")
+	queryArgs := toChaincodeArgs(f, "a")
 
 	//   if chaincode being invoked is on the same channel,
 	//   then channel defaults to the current channel and args[2] can be "".
@@ -100,7 +107,7 @@ func (t *SimpleChaincode) invoke(stub shim.ChaincodeStubInterface, args []string
 		return shim.Error(errStr)
 	}
 
-	queryArgs = util.ToChaincodeArgs(f, "b")
+	queryArgs = toChaincodeArgs(f, "b")
 	response = stub.InvokeChaincode(chaincodeName, queryArgs, channelName)
 	if response.Status != shim.OK {
 		errStr := fmt.Sprintf("Failed to query chaincode. Got error: %s", response.Payload)
@@ -147,7 +154,7 @@ func (t *SimpleChaincode) query(stub shim.ChaincodeStubInterface, args []string)
 
 	// Query chaincode_example02
 	f := "query"
-	queryArgs := util.ToChaincodeArgs(f, "a")
+	queryArgs := toChaincodeArgs(f, "a")
 
 	//   if chaincode being invoked is on the same channel,
 	//   then channel defaults to the current channel and args[2] can be "".
@@ -166,7 +173,7 @@ func (t *SimpleChaincode) query(stub shim.ChaincodeStubInterface, args []string)
 		return shim.Error(errStr)
 	}
 
-	queryArgs = util.ToChaincodeArgs(f, "b")
+	queryArgs = toChaincodeArgs(f, "b")
 	response = stub.InvokeChaincode(chaincodeName, queryArgs, channelName)
 	if response.Status != shim.OK {
 		errStr := fmt.Sprintf("Failed to query chaincode. Got error: %s", response.Payload)