Merge "[FAB-15929] Add getPrivateDataHash support"

Author: jt-nti

fabric-chaincode-integration-test/build.gradle

@@ -1,8 +1,7 @@
 dependencies {
     compile project(':fabric-chaincode-docker')
     testCompile 'org.testcontainers:testcontainers:1.10.3'
-    testCompile 'org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.4.1'
-    compile project(':fabric-chaincode-shim')
+    testCompile 'org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.4.4'
 }
 
 task getLatestDockerImages{

fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/FirstNetworkIntegrationTest.java

@@ -18,10 +18,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.github.dockerjava.api.exception.ConflictException;
-import com.google.protobuf.ByteString;
-
 import org.hamcrest.Matchers;
+import org.hyperledger.fabric.sdk.ChaincodeResponse;
 import org.hyperledger.fabric.sdk.Channel;
 import org.hyperledger.fabric.sdk.HFClient;
 import org.hyperledger.fabric.sdk.InstallProposalRequest;
@@ -36,14 +34,16 @@
 import org.hyperledger.fabric.sdk.exception.ProposalException;
 import org.hyperledger.fabric.sdk.exception.TransactionException;
 import org.hyperledger.fabric.sdk.security.CryptoSuite;
-import org.hyperledger.fabric.shim.Chaincode;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.testcontainers.containers.DockerComposeContainer;
 
+import com.github.dockerjava.api.exception.ConflictException;
+import com.google.protobuf.ByteString;
+
 public class FirstNetworkIntegrationTest {
 
     @ClassRule
@@ -338,7 +338,7 @@ private void executeAndValidateQueryOnAccount(HFClient client, Channel channel,
                         .stream()
                         .filter(peer -> peer.getName().contains(peerName))
                         .collect(Collectors.toList()),
-                Matchers.is(Chaincode.Response.Status.SUCCESS.getCode()),
+                Matchers.is(ChaincodeResponse.Status.SUCCESS.getStatus()),
                 Matchers.anything(),
                 Matchers.is(ByteString.copyFrom(expectedAmount, StandardCharsets.UTF_8))
         );
@@ -394,7 +394,7 @@ private void executeAndValidateQueryOnAccountNewPM(HFClient client, Channel chan
                         .stream()
                         .filter(peer -> peer.getName().contains(peerName))
                         .collect(Collectors.toList()),
-                Matchers.is(Chaincode.Response.Status.SUCCESS.getCode()),
+                Matchers.is(ChaincodeResponse.Status.SUCCESS.getStatus()),
                 Matchers.anything(),
                 Matchers.is(ByteString.copyFrom(expectedAmount, StandardCharsets.UTF_8))
         );

fabric-chaincode-protos/build.gradle

@@ -32,7 +32,9 @@ def protoFiles = ['protos/common/common.proto'                     : "$protosDir
                   'protos/msp/identities.proto'                    : "$protosDir/msp/identities.proto",
                   'protos/peer/transaction.proto'                  : "$protosDir/peer/transaction.proto",
                   'protos/msp/msp_principal.proto'                 : "$protosDir/msp/msp_principal.proto",
-                  'protos/common/policies.proto'                   : "$protosDir/common/policies.proto"]
+                  'protos/common/policies.proto'                   : "$protosDir/common/policies.proto",
+                  'protos/token/operations.proto'                  : "$protosDir/token/operations.proto",
+                  'protos/token/transaction.proto'                 : "$protosDir/token/transaction.proto"]
 
 buildscript {
     repositories {