[FABJ-380] Chaincode & tests-Private data via transient

Updated Java SDK's private data integration tests and corresponding
golang chaincode to send arguments via transient field

Change-Id: I4216cbcfada42fdf64466abe29ae57120b34ba0f
Signed-off-by: Amol Pednekar <amol_pednekar@persistent.com>

Author: Amol Pednekar

src/test/fixture/sdkintegration/gocc/samplePrivateData/src/github.com/private_data_cc/private_data_cc.go

@@ -72,12 +72,21 @@ func (t *SimpleChaincode) move(stub shim.ChaincodeStubInterface, args []string)
 	var X int          // Transaction value
 	var err error
 
-	if len(args) != 3 {
-		return shim.Error("Incorrect number of arguments. Expecting 3, function followed by 2 names and 1 value")
+	if len(args) != 0 {
+    		return shim.Error("Incorrect number of arguments. All attributes must be included in the transient map.")
+    }
+
+    transMap, err := stub.GetTransient()
+    	if err != nil {
+    		return shim.Error("Error getting transient: " + err.Error())
+    }
+
+    if len(transMap) !=3 {
+		return shim.Error("Incorrect number of arguments. Expecting 3, function followed by 2 names and 1 value, got " + strconv.Itoa(len(transMap)))
 	}
 
-	A = args[0]
-	B = args[1]
+	A = string(transMap["A"])
+	B = string(transMap["B"])
 
 	// Get the state from the ledger
 	// TODO: will be nice to have a GetAllState call to ledger
@@ -100,7 +109,7 @@ func (t *SimpleChaincode) move(stub shim.ChaincodeStubInterface, args []string)
 	Bval, _ = strconv.Atoi(string(Bvalbytes))
 
 	// Perform the execution
-	X, err = strconv.Atoi(args[2])
+	X, err = strconv.Atoi(string(transMap["moveAmount"]))
 	if err != nil {
 		return shim.Error("Invalid transaction amount, expecting a integer value")
 	}
@@ -128,19 +137,27 @@ func (t *SimpleChaincode) set(stub shim.ChaincodeStubInterface, args []string) p
 	var Aval, Bval int // Asset holdings
 	var err error
 
-	if len(args) != 4 {
-		return shim.Error("Incorrect number of arguments. Expecting 4, function followed by 2 names and 2 values")
+	if len(args) != 0 {
+		return shim.Error("Incorrect number of arguments. All attributes must be included in the transient map.")
+	}
+
+	transMap, err := stub.GetTransient()
+	if err != nil {
+		return shim.Error("Error getting transient: " + err.Error())
+	}
+
+	if len(transMap) !=4 {
+		return shim.Error("Incorrect number of arguments. Expecting 4, function followed by 2 names and 2 values, got " + strconv.Itoa(len(transMap)))
 	}
 
-	A = args[0]
-	Aval, err = strconv.Atoi(args[1])
+	A = string(transMap["A"])
+	Aval, err = strconv.Atoi(string(transMap["AVal"]))
     if err != nil {
         return shim.Error("Invalid A value amount, expecting a integer value")
     }
 
-	B = args[2]
-
-	Bval, err = strconv.Atoi(args[3])
+	B = string(transMap["B"])
+	Bval, err = strconv.Atoi(string(transMap["BVal"]))
     if err != nil {
        return shim.Error("Invalid B value amount, expecting a integer value")
     }
@@ -168,30 +185,39 @@ func (t *SimpleChaincode) set(stub shim.ChaincodeStubInterface, args []string) p
 // Query callback representing the query of a chaincode ===>>>  ONLY Query B VALUES
 func (t *SimpleChaincode) query(stub shim.ChaincodeStubInterface, args []string) pb.Response {
 
-	var A string // Entities
+	var QueryKey string // Entities
 	var err error
 
-	if len(args) != 1 {
-		return shim.Error("Incorrect number of arguments. Expecting name of the person to query")
+	if len(args) != 0 {
+		return shim.Error("Incorrect number of arguments. All attributes must be included in the transient map.")
+	}
+
+	transMap, err := stub.GetTransient()
+		if err != nil {
+			return shim.Error("Error getting transient: " + err.Error())
+	}
+
+	if len(transMap) !=1 {
+		return shim.Error("Incorrect number of arguments. Expecting 1, function followed by query key, got " + strconv.Itoa(len(transMap)))
 	}
 
-	A = args[0]
+	QueryKey = string(transMap["B"])
 
-	logger.Infof("query for  %s\n", A)
+	logger.Infof("query for  %s\n", QueryKey)
 
 	// Get the state from the ledger
-	Avalbytes, err := stub.GetPrivateData("COLLECTION_FOR_B", A)
+	Avalbytes, err := stub.GetPrivateData("COLLECTION_FOR_B", QueryKey)
 	if err != nil {
-		jsonResp := "{\"Error\":\"Failed to get state for " + A + "\"}"
+		jsonResp := "{\"Error\":\"Failed to get state for " + QueryKey + "\"}"
 		return shim.Error(jsonResp)
 	}
 
 	if Avalbytes == nil {
-		jsonResp := "{\"Error\":\"Nil amount for " + A + "\"}"
+		jsonResp := "{\"Error\":\"Nil amount for " + QueryKey + "\"}"
 		return shim.Error(jsonResp)
 	}
 
-	jsonResp := "{\"Name\":\"" + A + "\",\"Amount\":\"" + string(Avalbytes) + "\"}"
+	jsonResp := "{\"Name\":\"" + QueryKey + "\",\"Amount\":\"" + string(Avalbytes) + "\"}"
 	logger.Infof("Query Response:%s\n", jsonResp)
 	return shim.Success(Avalbytes)
 }

src/test/java/org/hyperledger/fabric/sdkintegration/PrivateDataIT.java

@@ -21,8 +21,10 @@
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
@@ -44,6 +46,7 @@
 import org.hyperledger.fabric.sdk.TransactionProposalRequest;
 import org.hyperledger.fabric.sdk.TransactionRequest;
 import org.hyperledger.fabric.sdk.User;
+import org.hyperledger.fabric.sdk.exception.InvalidArgumentException;
 import org.hyperledger.fabric.sdk.exception.ProposalException;
 import org.hyperledger.fabric.sdk.exception.TransactionEventException;
 import org.hyperledger.fabric.sdk.security.CryptoSuite;
@@ -356,8 +359,15 @@ CompletableFuture<BlockEvent.TransactionEvent> moveAmount(HFClient client, Chann
             TransactionProposalRequest transactionProposalRequest = client.newTransactionProposalRequest();
             transactionProposalRequest.setChaincodeID(chaincodeID);
             transactionProposalRequest.setFcn("move");
-            transactionProposalRequest.setArgs(new byte[][] {//test using bytes .. end2end uses Strings.
-                    "a".getBytes(UTF_8), "b".getBytes(UTF_8), moveAmount.getBytes(UTF_8)});
+
+            // Private data needs to be sent via Transient field to prevent identifiable
+            //information being sent to the orderer.
+            Map<String, byte[]> transientMap = new HashMap<>();
+            transientMap.put("A", "a".getBytes(UTF_8)); //test using bytes .. end2end uses Strings.
+            transientMap.put("B", "b".getBytes(UTF_8));
+            transientMap.put("moveAmount", moveAmount.getBytes(UTF_8));
+            transactionProposalRequest.setTransientMap(transientMap);
+
             transactionProposalRequest.setProposalWaitTime(testConfig.getProposalWaitTime());
             if (user != null) { // specific user use that
                 transactionProposalRequest.setUserContext(user);
@@ -411,7 +421,14 @@ CompletableFuture<BlockEvent.TransactionEvent> setAmount(HFClient client, Channe
             TransactionProposalRequest transactionProposalRequest = client.newTransactionProposalRequest();
             transactionProposalRequest.setChaincodeID(chaincodeID);
             transactionProposalRequest.setFcn("set");
-            transactionProposalRequest.setArgs("a", "500", "b", "" + (200 + delta));
+
+            Map<String, byte[]> transientMap = new HashMap<>();
+            transientMap.put("A", "a".getBytes(UTF_8));   // test using bytes as args. End2end uses Strings.
+            transientMap.put("AVal", "500".getBytes(UTF_8));
+            transientMap.put("B", "b".getBytes(UTF_8));
+            String arg3 = "" + (200 + delta);
+            transientMap.put("BVal", arg3.getBytes(UTF_8));
+            transactionProposalRequest.setTransientMap(transientMap);
 
             transactionProposalRequest.setProposalWaitTime(testConfig.getProposalWaitTime());
             if (user != null) { // specific user use that
@@ -457,14 +474,16 @@ CompletableFuture<BlockEvent.TransactionEvent> setAmount(HFClient client, Channe
     private void queryChaincodeForExpectedValue(HFClient client, Channel channel, final String expect, ChaincodeID chaincodeID) {
 
         out("Now query chaincode %s on channel %s for the value of b expecting to see: %s", chaincodeID, channel.getName(), expect);
-        QueryByChaincodeRequest queryByChaincodeRequest = client.newQueryProposalRequest();
-        queryByChaincodeRequest.setArgs("b".getBytes(UTF_8)); // test using bytes as args. End2end uses Strings.
-        queryByChaincodeRequest.setFcn("query");
-        queryByChaincodeRequest.setChaincodeID(chaincodeID);
-
         Collection<ProposalResponse> queryProposals;
-
         try {
+            QueryByChaincodeRequest queryByChaincodeRequest = client.newQueryProposalRequest();
+            queryByChaincodeRequest.setFcn("query");
+            queryByChaincodeRequest.setChaincodeID(chaincodeID);
+
+            Map<String, byte[]> tmap = new HashMap<>();
+            tmap.put("B", "b".getBytes(UTF_8)); // test using bytes as args. End2end uses Strings.
+            queryByChaincodeRequest.setTransientMap(tmap);
+
             queryProposals = channel.queryByChaincode(queryByChaincodeRequest);
         } catch (Exception e) {
             throw new CompletionException(e);