FAB-6117 Update proto. snapshot fix

Orderer wait time overall configurable.
Remove dead code CACERTS dir.

Change-Id: Ib6b31f6fa4e2280b023e792d0659006eaab48eb5
Signed-off-by: rickr <cr22rc@gmail.com>

Author: cr22rc

README.md

@@ -65,6 +65,49 @@ Add below code in your `pom.xml` to download fabric-sdk-java-1.0.1
 
 `*************************************************`
 
+## 1.1.0-SNAPSHOT builds
+Work in progress 1.1.0 SNAPSHOT builds can be used by adding the following to your application's
+pom.xml
+```
+<dependencies>
+
+        <!-- https://mvnrepository.com/artifact/org.hyperledger.fabric-sdk-java/fabric-sdk-java -->
+        <dependency>
+            <groupId>org.hyperledger.fabric-sdk-java</groupId>
+            <artifactId>fabric-sdk-java</artifactId>
+            <version>1.1.0-SNAPSHOT</version>
+        </dependency>
+
+</dependencies>
+```
+
+Add to your maven's setting.xml typically in the .m2 directory under your home directory:
+```
+<profiles>
+      <profile>
+         <id>allow-snapshots</id>
+         <activation>
+            <activeByDefault>true</activeByDefault>
+         </activation>
+         <repositories>
+            <repository>
+               <id>snapshots-repo</id>
+               <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+               <releases>
+                  <enabled>false</enabled>
+               </releases>
+               <snapshots>
+                  <enabled>true</enabled>
+               </snapshots>
+            </repository>
+         </repositories>
+      </profile>
+</profiles>
+```
+
+
+
+
 
 ## Latest builds of Fabric and Fabric-ca v1.1.0
 
@@ -74,7 +117,7 @@ You can clone these projects by going to the [Hyperledger repository](https://ge
 
 ## Working with the Fabric Vagrant environment
 Vagrant is NOT required if your OS has Docker support and all the requirements needed to build directly in your
-environment.  For non Vagrant envrionment, the steps would be the same as below minus those parts involving Vagrant.
+environment.  For non Vagrant environment, the steps would be the same as below minus those parts involving Vagrant.
  Do the following if you want to run the Fabric components ( peer, orderer, fabric-ca ) in Vagrant:
 
   ```
@@ -157,6 +200,10 @@ or
 To run the unit tests, please use <code>mvn test</code> or <code>mvn install</code> which will run the unit tests and build the jar file.
 You must be running a local peer and orderer to be able to run the unit tests.
 
+**Many unit tests will test failure condition's resulting in exceptions and stack traces being displayed. This is not an indication of failure!**
+
+**[INFO] BUILD SUCCESS**  **_At the end is usually a very reliable indication that all tests have passed successfully!_**
+
 ### Running the integration tests
 You must be running local instances of Fabric-ca, Fabric peers, and Fabric orderers to be able to run the integration tests. See above for running these services in Vagrant.
 Use this `maven` command to run the integration tests:
@@ -261,10 +308,19 @@ your server(s) hostname(s) and port(s).
 
 ### GO Lang chaincode
 Go lang chaincode dependencies must be contained in vendor folder.
- For an explanation of this see [Vender folder explanation](https://blog.gopheracademy.com/advent-2015/vendor-folder/)
+ For an explanation of this see [Vendor folder explanation](https://blog.gopheracademy.com/advent-2015/vendor-folder/)
 
 
 ## Basic Troubleshooting
+
+**Firewalls, load balancers, network proxies**
+
+These can sometimes silently kill a network connections and prevent them from auto reconnecting. To fix this look at
+adding to Peers, EventHub's and Orderer's connection properties:
+`grpc.NettyChannelBuilderOption.keepAliveTime`, `grpc.NettyChannelBuilderOption.keepAliveTimeout`,
+`grpc.NettyChannelBuilderOption.keepAliveWithoutCalls`. Examples of this are in End2endIT.java
+
+
 **identity or token do not match**
 
 Keep in mind that you can perform the enrollment process with the membership services server only once, as the enrollmentSecret is a one-time-use password. If you have performed a FSUser registration/enrollment with the membership services and subsequently deleted the crypto tokens stored on the client side, the next time you try to enroll, errors similar to the ones below will be seen.

pom.xml

@@ -4,7 +4,7 @@
     <groupId>org.hyperledger.fabric-sdk-java</groupId>
     <artifactId>fabric-sdk-java</artifactId>
     <packaging>jar</packaging>
-    <version>${fabric.sdk.java.version}-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <name>fabric-java-sdk</name>
     <description>Java SDK for Hyperledger fabric project</description>
     <url>https://www.hyperledger.org/community/projects</url>
@@ -28,7 +28,6 @@
         <tag>fabric-sdk-java-1.0</tag>
     </scm>
     <properties>
-        <fabric.sdk.java.version>1.1.0</fabric.sdk.java.version>
         <grpc.version>1.5.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
         <bouncycastle.version>1.57</bouncycastle.version>
         <httpclient.version>4.5.3</httpclient.version>
@@ -37,6 +36,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jacoco.version>0.7.9</jacoco.version>
         <org.hyperledger.fabric.sdktest.ITSuite>IntegrationSuite.java</org.hyperledger.fabric.sdktest.ITSuite>
+        <gpg.executable>gpg2</gpg.executable>
     </properties>
 
     <reporting>
@@ -495,7 +495,7 @@
                             <git-commit-id>${git.commit.id}</git-commit-id>
                             <git-branch>${git.branch}</git-branch>
                             <git-commit-time>${git.commit.time}</git-commit-time>
-                            <fabric-sdk-java-version>${fabric.sdk.java.version}</fabric-sdk-java-version>
+                            <fabric-sdk-java-version>${project.version}</fabric-sdk-java-version>
                         </manifestEntries>
                     </archive>
                 </configuration>

src/main/java/org/hyperledger/fabric/sdk/OrdererClient.java

@@ -30,6 +30,7 @@
 import org.hyperledger.fabric.protos.orderer.Ab.DeliverResponse;
 import org.hyperledger.fabric.protos.orderer.AtomicBroadcastGrpc;
 import org.hyperledger.fabric.sdk.exception.TransactionException;
+import org.hyperledger.fabric.sdk.helper.Config;
 
 import static java.lang.String.format;
 import static org.hyperledger.fabric.protos.orderer.Ab.DeliverResponse.TypeCase.STATUS;
@@ -38,7 +39,8 @@
  * Sample client code that makes gRPC calls to the server.
  */
 class OrdererClient {
-    private static final long ORDERER_WAIT_TIME = 3000L;
+    private static final Config config = Config.getConfig();
+    private static final long ORDERER_WAIT_TIME = config.getOrdererWaitTime();
     private final String channelName;
     private final ManagedChannelBuilder channelBuilder;
     private boolean shutdown = false;
@@ -280,7 +282,7 @@ public void onCompleted() {
             try {
                 if (!finishLatch.await(ordererWaitTimeMilliSecs, TimeUnit.MILLISECONDS)) {
                     TransactionException ex = new TransactionException(format(
-                            "Channel %s sendDeliver time exceeded for orderer %s, timed out at %d", channelName, name, ordererWaitTimeMilliSecs));
+                            "Channel %s sendDeliver time exceeded for orderer %s, timed out at %d ms.", channelName, name, ordererWaitTimeMilliSecs));
                     logger.error(ex.getMessage(), ex);
                     throw ex;
                 }

src/main/java/org/hyperledger/fabric/sdk/helper/Config.java

@@ -39,10 +39,10 @@ public class Config {
     public static final String ORG_HYPERLEDGER_FABRIC_SDK_CONFIGURATION = "org.hyperledger.fabric.sdk.configuration";
     public static final String SECURITY_LEVEL = "org.hyperledger.fabric.sdk.security_level";
     public static final String HASH_ALGORITHM = "org.hyperledger.fabric.sdk.hash_algorithm";
-    public static final String CACERTS = "org.hyperledger.fabric.sdk.cacerts";
     public static final String PROPOSAL_WAIT_TIME = "org.hyperledger.fabric.sdk.proposal.wait.time";
     public static final String CHANNEL_CONFIG_WAIT_TIME = "org.hyperledger.fabric.sdk.channelconfig.wait_time";
     public static final String ORDERER_RETRY_WAIT_TIME = "org.hyperledger.fabric.sdk.orderer_retry.wait_time";
+    public static final String ORDERER_WAIT_TIME = "org.hyperledger.fabric.sdk.orderer.ordererWaitTimeMilliSecs";
     public static final String EVENTHUB_CONNECTION_WAIT_TIME = "org.hyperledger.fabric.sdk.eventhub_connection.wait_time";
     public static final String PROPOSAL_CONSISTENCY_VALIDATION = "org.hyperledger.fabric.sdk.proposal.consistency_validation";
     public static final String GENESISBLOCK_WAIT_TIME = "org.hyperledger.fabric.sdk.channel.genesisblock_wait_time";
@@ -91,8 +91,6 @@ private Config() {
             defaultProperty(SECURITY_LEVEL, "256");
             defaultProperty(HASH_ALGORITHM, "SHA2");
             defaultProperty(PROPOSAL_CONSISTENCY_VALIDATION, "true");
-            // TODO remove this once we have implemented MSP and get the peer certs from the channel
-            defaultProperty(CACERTS, "/genesisblock/peercacert.pem");
 
             defaultProperty(PROPOSAL_WAIT_TIME, "20000");
             defaultProperty(GENESISBLOCK_WAIT_TIME, "5000");
@@ -102,6 +100,7 @@ private Config() {
             defaultProperty(DIAGNOTISTIC_FILE_DIRECTORY, null);
             defaultProperty(CHANNEL_CONFIG_WAIT_TIME, "15000");
             defaultProperty(ORDERER_RETRY_WAIT_TIME, "200");
+            defaultProperty(ORDERER_WAIT_TIME, "3000");
             defaultProperty(EVENTHUB_CONNECTION_WAIT_TIME, "1000");
 
             final String inLogLevel = sdkProperties.getProperty(LOGGERLEVEL);
@@ -218,10 +217,6 @@ public String getHashAlgorithm() {
 
     }
 
-    public String[] getPeerCACerts() {
-        return getProperty(CACERTS).split("'");
-    }
-
     /**
      * Get the timeout for a single proposal request to endorser.
      *
@@ -258,6 +253,10 @@ public long getOrdererRetryWaitTime() {
         return Long.parseLong(getProperty(ORDERER_RETRY_WAIT_TIME));
     }
 
+    public long getOrdererWaitTime() {
+        return Long.parseLong(getProperty(ORDERER_WAIT_TIME));
+    }
+
     public long getEventHubConnectionWaitTime() {
         return Long.parseLong(getProperty(EVENTHUB_CONNECTION_WAIT_TIME));
     }

src/main/proto/common/configuration.proto

@@ -46,3 +46,24 @@ message OrdererAddresses {
 message Consortium {
     string name = 1;
 }
+
+// Capabilities message contains all the capabilities that a channel requires
+// participant entities to comply with. The entity should drop off the channel
+// if it can't fulfill any of the required capabilities.
+// Capabilities is encoded into the configuaration as Values of each type
+// Orderer, Channel, or Application.
+// The key string should represent the capability name, and it must be unique
+// within each type. For readability, it may be advisable to prefix the key with
+// its type (eg app-acl)
+message Capabilities {
+    map<string, Capability> capabilities = 1;
+}
+
+// Capability holds a set of options. We can add more as needed in the
+// future. For now, whether it is required or not. If a configured capability
+// is not required, it must be completely compatible with previous releases.
+// Compatible features are not required to be encoded as capabilities; they
+// only provide flexibility for the admins to control the features.
+message Capability {
+    bool required = 1;
+}

src/test/java/org/hyperledger/fabric/sdk/helper/ConfigTest.java

@@ -15,7 +15,6 @@
 package org.hyperledger.fabric.sdk.helper;
 
 import org.apache.log4j.Level;
-
 import org.hyperledger.fabric.sdk.TestConfigHelper;
 import org.junit.After;
 import org.junit.Assert;
@@ -24,7 +23,7 @@
 
 public class ConfigTest {
 
-    private TestConfigHelper configHelper = new TestConfigHelper();
+    private final TestConfigHelper configHelper = new TestConfigHelper();
     // private String originalHashAlgorithm;
 
     @Before
@@ -94,9 +93,6 @@ public void testGetters() {
         Assert.assertNotNull(config.getSymmetricAlgorithm());
         Assert.assertNotNull(config.getSignatureAlgorithm());
         Assert.assertNotNull(config.getCertificateFormat());
-
-        // Arrays
-        Assert.assertNotNull(config.getPeerCACerts());
     }
 
     @Test

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

@@ -655,6 +655,7 @@ private Channel constructChannel(String name, HFClient client, SampleOrg sampleO
             // Under 5 minutes would require changes to server side to accept faster ping rates.
             ordererProperties.put("grpc.NettyChannelBuilderOption.keepAliveTime", new Object[] {5L, TimeUnit.MINUTES});
             ordererProperties.put("grpc.NettyChannelBuilderOption.keepAliveTimeout", new Object[] {8L, TimeUnit.SECONDS});
+            ordererProperties.put("grpc.NettyChannelBuilderOption.keepAliveWithoutCalls", new Object[] {true});
 
             orderers.add(client.newOrderer(orderName, sampleOrg.getOrdererLocation(orderName),
                     ordererProperties));