Feature/#11 private data

README.md

@@ -18,11 +18,6 @@ To work with already configured channel you will need to provide following data
         - cert – path to user certificate pem file
         - privateKey – path to user private key pem file
         - mspID – id of organization(predefined in fabric network) that user belongs to
-- eventhubs – list of event hubs (deprecated, use peer event service)
-    - key-name – key value that can be used for referring eventhubs in this config file
-        - url – url for access
-        - pemFile – file location for x509 pem certificate for SSL
-        - properties – list of eventhub SDK properties
 - peers – list of peers
     - key-name – key value that can be used for referring peer in this config file
         - url – url for access
@@ -37,8 +32,7 @@ To work with already configured channel you will need to provide following data
     - key-name – key value that can be used for referring channel in application
         - admin – user that will be used for working with this channel
         - orderers – list of orderer key-names that serve this channel
-        - peers – list of peer key-names that serve this channel
-        - eventhubs (deprecated) – list of eventhub key-names that serve this channel
+        - peers – list of peer key-names that serve this channel        
 
 - cas – list of CAs
     - key-name – key value that can be used for referring CA in application

build.gradle

@@ -1,5 +1,5 @@
 group 'com.luxoft'
-version '1.4.2'
+version '1.4.5'
 ext.mavenLocalGroupId = 'com.github.Luxoft'
 
 apply plugin: 'maven-publish'

fabric-configurator/README.md

@@ -18,16 +18,14 @@ Path of congitxlator can be overridden with parameter --configtxlator (ex. --con
 Types of operations supported by the configurator:
 
 - **config** - create channels and deploy chaincodes using fabric.yaml
-    - `%jar% --type=config --config=network/fabric-devnet.yaml --skipunauth`
+    - `%jar% --type=config --config=network/fabric-devnet.yaml`
         - *config* - fabric.yaml configuration
-        - *skipunauth* (optional) - flag to skip failures on unauthorized requests
         - *wait-chaincode* (optional) - flag to wait till chaincodes are fully initialized
 - **wait-chaincode** - wait till chaincodes are fully initialized
-    - `%jar% --type=wait-chaincode --config=network/fabric-devnet.yaml --name=chaincode --timeout=60 --skipunauth`
+    - `%jar% --type=wait-chaincode --config=network/fabric-devnet.yaml --name=chaincode --timeout=60
         - *config* - fabric.yaml configuration
         - *name* (multiple, optional) - names of chaincodes
         - *timeout* (optional) - seconds to wait, defaults to 60
-        - *skipunauth* (optional) - flag to skip failures on unauthorized requests
 - **deploy** - deploy chaincode
     - `%jar% --type=deploy --name=mychaincode`
         - *name* - chaincode name

fabric-configurator/src/main/java/com/luxoft/fabric/configurator/Configurator.java

@@ -66,7 +66,6 @@ public static void main(String[] args) throws Exception {
         OptionSpec<String> admin = parser.accepts("admin").withRequiredArg().ofType(String.class);
         OptionSpec<String> signatures = parser.accepts("signature").withRequiredArg().ofType(String.class);
         OptionSpec<Integer> timeout = parser.accepts("timeout").withOptionalArg().ofType(Integer.class).defaultsTo(60);
-        OptionSpec skipunauth = parser.accepts("skipunauth");
         OptionSpec waitchaincodes = parser.accepts("waitchaincodes");
 
         OptionSet options = parser.parse(args);
@@ -84,7 +83,7 @@ public static void main(String[] args) throws Exception {
         FabricConfig fabricConfig = FabricConfig.getConfigFromFile(configFile);
 
         if(!options.has(type) || mode.equals(Arguments.CONFIG)) {
-            success = cfg.configNetwork(fabricConfig, options.has(skipunauth), options.has(waitchaincodes), options.valueOf(timeout));
+            success = cfg.configNetwork(fabricConfig, options.has(waitchaincodes), options.valueOf(timeout));
         } else if (mode.equals(Arguments.ENROLL)) {
             UserEnroller.run(fabricConfig);
         } else if (mode.equals(Arguments.GET_CHANNEL)) {
@@ -168,7 +167,7 @@ public static void main(String[] args) throws Exception {
             else if (mode.equals(Arguments.UPGRADE))
                 cfg.upgradeChaincodes(hfClient, fabricConfig, names);
             else if (mode.equals(Arguments.WAIT_CHAINCODE))
-                success = cfg.waitChaincodes(hfClient, fabricConfig, names, options.valueOf(timeout), options.has(skipunauth));
+                success = cfg.waitChaincodes(hfClient, fabricConfig, names, options.valueOf(timeout));
         }
 
         System.exit(success ? 0 : 1);