Fix digital prop app (#111)

* fix all the problems and move to node 8 syntax

Signed-off-by: Dave Kelsey <[email protected]>

* fix code bug and update readme to support 0.17

Signed-off-by: Dave Kelsey <[email protected]>

* updates based on review

Signed-off-by: Dave Kelsey <[email protected]>

Author: Dave Kelsey

Diff for: packages/digitalproperty-app/CmdOrder.png

@@ -8,29 +8,39 @@ This sample application should be run against a v1.0 Hyperledger Fabric (and whi
 
 These scripts use Node v6, and bash, which are Hyperledger Composer dependencies. Choose a directory that you wish to have the setup scripts within.
 
-1. In a directory of your choice (will assume `~/fabric-tools`) get the zip file that contains the tools.  There are both .zip and .tar.gz formats
+1. In a directory of your choice (will assume `~/fabric-tools`) get the zip file that contains the tools.  There are both .tar.gz and .zip formats
 ```
 $ mkdir ~/fabric-tools && cd ~/fabric-tools
-$ curl -O https://raw.githubusercontent.com/hyperledger/composer-tools/master/packages/fabric-dev-servers/fabric-dev-servers.zip
-$ unzip fabric-dev-servers.zip
+$ curl -O https://raw.githubusercontent.com/hyperledger/composer-tools/master/packages/fabric-dev-servers/fabric-dev-servers.tar.gz
+$ tar xvzf fabric-dev-servers.tar.gz
+
 ```
 
 ```
 $ mkdir ~/fabric-tools && cd ~/fabric-tools
-$ curl -O https://raw.githubusercontent.com/hyperledger/composer-tools/master/packages/fabric-dev-servers/fabric-dev-servers.tar.gz
-$ tar xvzf fabric-dev-servers.tar.gz
+$ curl -O https://raw.githubusercontent.com/hyperledger/composer-tools/master/packages/fabric-dev-servers/fabric-dev-servers.zip
+$ unzip fabric-dev-servers.zip
+```
 
+**IMPORTANT** if you are running this sample application using Hyperledger composer version 0.17 or higher then you need to be using Hyperledger fabric 1.1. To ensure this you must ensure you set the version to 1.1 as follows
+
+```
+$ export FABRIC_VERSION=hlfv11
+```
+If you have been using composer version 0.16 then you will need to clear out your file system card store as cards in there are not compatible with 0.17. The quickest way to do this is 
+```
+$ rm -fr $HOME/.composer
 ```
 
-2. If this is the first time you've run this tutorial, you'll need to download the fabric first. If you have already downloaded a set of Fabric images then first start the fabric (see below), and create a Composer profile.  Make sure you don't have a previous network (digitalproperty-network) docker container left running as 'legacy' - remove legacy containers as necessary using `docker rm`). After that, you can then choose to stop the fabric, and start it again later. Alternatively, to completely clean up, you can 'teardown' the Fabric and the Composer profile / sample credentials (see more below).
+2. If this is the first time you've run this tutorial, you'll need to download the fabric first. If you have already downloaded a set of Fabric images then first start the fabric (see below), and create a Composer business network card.  Make sure you don't have a previous network (digitalproperty-network) docker container left running as 'legacy' - remove legacy containers as necessary using `docker rm`). After that, you can then choose to stop the fabric, and start it again later. Alternatively, to completely clean up, you can 'teardown' the Fabric (see more below).
 
 All the scripts will be in the directory `~/fabric-tools` you created above.  A typical sequence for Hyperledger Composer startup  would be:
 
 ```
 $ cd ~/fabric-tools
 $ ./downloadFabric.sh
 $ ./startFabric.sh
-$ ./createComposerProfile.sh
+$ ./createPeerAdminCard.sh
 ```
 
 Then at the end of your development session
@@ -70,14 +80,15 @@ By default, this 'start' script will pause for 15 seconds to let Fabric start -
 $ export FABRIC_START_TIMEOUT=30
 ```
 
-### Create Composer Profile
+### Create Composer Business network card
+This will create a business network card and import it into the card store. This card provides the ability to install and start business networks on the hyperledger fabric network.
 
 Issue this command from the `fabric-tools` directory
 ```
-$ ./createComposerProfile.sh
+$ ./createPeerAdminCard.sh
 ```
 
-Note: this create a Hyperledger Composer profile specifically to connect to the development fabric you've already started.
+Note: this create a Hyperledger Composer business network card specifically to connect to the development fabric you've already started.
 
 ### Teardown Fabric (when you want to 'clean' up and start afresh)
 
@@ -86,14 +97,6 @@ Issue from the `fabric-tools` directory
 $ ./teardownFabric.sh
 ```
 
-
-### Command Ordering
-
-This diagram should to clarify the order in which the scripts can be run.  
-
-![](CmdOrder.png).
-
-
 # Step 2: Getting the Hyperledger Composer sample application (the Digital Property CLI sample application) up and running
 
 1. Make sure you've started Fabric as in Step 1 above. For example, If this is your first time for example
@@ -102,7 +105,7 @@ This diagram should to clarify the order in which the scripts can be run.
 $ cd ~/fabric-tools
 $ ./downloadFabric.sh
 $ ./startFabric.sh
-$ ./createComposerProfile.sh
+$ ./createPeerAdminCard.sh
 ```
 
 2. Clone the sample application into a directory of your choice - BUT not the same directory as in Step 1. (Assume `~/github')
@@ -113,6 +116,22 @@ $ cd composer-sample-applications
 $
 ```
 
+**IMPORTANT** if you are using Composer 0.17 or higher and thus Hyperledger Fabric 1.1, then you need to change the application to use the correct version of Composer. To do this open the file `packages/digitalproperty-app/package.json` and change all the references to composer dependencies from `^0.16.3` to `^0.17.2` eg.
+```
+  "dependencies": {
+    "cli-table": "^0.3.1",
+    "composer-cli": "^0.17.2",
+    "composer-client": "^0.17.2",
+    "digitalproperty-network": "^0.1.2",
+    "jsonfile": "^2.4.0",
+    "lodash": "^4.17.4",
+    "prettyjson": "^1.2.1",
+    "sprintf-js": "^1.0.3",
+    "winston": "^2.3.0",
+    "yargs": "^6.5.0"
+  },
+```
+
 OPTIONAL: To see a summary of all the sample applications, there's a simple command that will show summary details of the sample applications available in this repository. A useful information node.js script has been created to show the available sample applications - note you will need to run `npm install` from the current directory (takes about 5-10 mins) before running this command.
 ```
 $ node ~/github/composer-sample-applications/info.js
@@ -130,6 +149,3 @@ $ npm run deployNetwork
 ```
 $ npm test
 ```
-
-
-

Diff for: packages/digitalproperty-app/Dockerfile

@@ -32,16 +32,16 @@ winston.loggers.add('application', {
 const LOG = winston.loggers.get('application');
 
 LOG.info('Hyperledger Composer: Digital Property console application');
-try{
-require('yargs')
-  .usage ('node cli.js  <participant> <action>')
-  .commandDir('lib/cmds')
-  .demand(1,'Please specify a partipant, for example:  digitalproperty landregistry <action>')
-  .help()
-  .strict()
-  .recommendCommands()
-  .epilogue('For more information visit us at https://hyperledger.github.io/composer')
-  .argv;
-} catch (err){
+try {
+    require('yargs')
+    .usage ('node cli.js  <participant> <action>')
+    .commandDir('lib/cmds')
+    .demand(1,'Please specify a partipant, for example:  digitalproperty landregistry <action>')
+    .help()
+    .strict()
+    .recommendCommands()
+    .epilogue('For more information visit us at https://hyperledger.github.io/composer')
+    .argv;
+} catch (err) {
   console.log(err);
 }

Diff for: packages/digitalproperty-app/README.md

@@ -22,15 +22,14 @@ exports.command = 'bootstrap';
 exports.desc = 'Add a set of default land titiles';
 exports.builder = {};
 
-exports.handler = function (argv) {
+exports.handler = async function (argv) {
     LOG.info('Adding default land titles to the asset registry');
-    return LandRegistry.addDefaultCmd(argv)
-.then(() => {
-    LOG.info ('Command completed successfully.');
-    process.exit(0);
-})
-.catch((error) => {
-    LOG.error(error+ '\nCommand failed.');
-    process.exit(1);
-});
+    try {
+        await LandRegistry.addDefaultCmd(argv);
+        LOG.info ('Command completed successfully.');
+        process.exit(0);
+    } catch(error) {
+        LOG.error(error+ '\nCommand failed.');
+        process.exit(1);
+    }
 };

Diff for: packages/digitalproperty-app/cli.js

@@ -22,20 +22,14 @@ const LOG = winston.loggers.get('application');
 exports.command = 'list';
 exports.desc = 'Lists all the land titles held in the Land Regsitry';
 exports.builder = {};
-exports.handler = function (argv) {
-
-
-    return LandRegistry.listCmd(argv)
-  .then(() => {
-      LOG.info('Command completed successfully.');
-      process.exit(0);
-  })
-  .catch((error) => {
-      LOG.error(error+ '\nCommand failed.');
-      process.exit(1);
-  });
-
-
-
-
+exports.handler = async function (argv) {
+
+    try {
+        await LandRegistry.listCmd(argv);
+        LOG.info('Command completed successfully.');
+        process.exit(0);
+    } catch(error) {
+        LOG.error(error+ '\nCommand failed.');
+        process.exit(1);
+    }
 };

Diff for: packages/digitalproperty-app/config/default.json

@@ -22,18 +22,12 @@ const LOG = winston.loggers.get('application');
 exports.command = 'listen';
 exports.desc = 'Listen for all events';
 exports.builder = {};
-exports.handler = function (argv) {
+exports.handler = async function (argv) {
 
-
-    return LandRegistry.listen(argv)
-  .then(() => {
-      LOG.info('Command completed successfully.');
-  })
-  .catch((error) => {
+    try {
+        await LandRegistry.listen(argv);
+        LOG.info('Command completed successfully.');
+    } catch(error) {
       LOG.error(error+ '\nCommand failed.');
-  });
-
-
-
-
+    }
 };

Diff for: packages/digitalproperty-app/config/hlfv0.6.json

@@ -22,20 +22,14 @@ const LOG = winston.loggers.get('application');
 exports.command = 'submit';
 exports.desc = 'Updates a fixed title in the regsitry';
 exports.builder = {};
-exports.handler = function (argv) {
-
-
-    return LandRegistry.submitCmd(argv)
-  .then(() => {
-      LOG.info('Command completed successfully.');
-      process.exit(0);
-  })
-  .catch((error) => {
-      LOG.error(error+ '\nCommand failed.');
-      process.exit(1);
-  });
-
-
-
-
+exports.handler = async function (argv) {
+
+    try {
+        await LandRegistry.submitCmd(argv);
+        LOG.info('Command completed successfully.');
+        process.exit(0);
+    } catch(error) {
+        LOG.error(error+ '\nCommand failed.');
+        process.exit(1);
+    }
 };