Add new features into Trusted Bench

.gitignore

@@ -6,6 +6,9 @@ node_modules/*
 package-lock.json
 output.log
 
+#Ignore default Caliper log location
+log/
+
 # Ignore any generted html files
 *.html
 

.travis/script.sh

@@ -24,24 +24,17 @@ echo "---- Target version ${VERSION}"
 if [ "${BENCHMARK}" == "composer" ]; then
     # Run version
     if [ "${VERSION}" == "0.19" ]; then
-        npm install composer-admin@">=0.19.0 <0.20.0"
-        npm install composer-client@">=0.19.0 <0.20.0"
-        npm install composer-common@">=0.19.0 <0.20.0"
-        npm install fabric-client@1.1.0
+        npm run composer-deps
         npm run test -- composer
     else
         echo "Unknown version ${VERSION} for benchmark ${BENCHMARK}"
         exit  1
     fi
 elif [ "${BENCHMARK}" == "drm" ]; then
-    npm install grpc@1.10.1
-    npm install fabric-ca-client@1.1.0
-    npm install fabric-client@1.1.0
+    npm run fabric-deps
     npm run test -- drm
 elif [ "${BENCHMARK}" == "simple" ]; then
-    npm install grpc@1.10.1
-    npm install fabric-ca-client@1.1.0
-    npm install fabric-client@1.1.0
+    npm run fabric-deps
     npm run test -- simple
 else
     echo "Unknown target benchmark ${BENCHMARK}"

ISSUE_TEMPLATE.md

@@ -0,0 +1,39 @@
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Context
+<!--- Provide a more detailed introduction to the issue itself, and why you consider it to be a bug -->
+
+## Expected Behavior
+<!--- Tell us what should happen -->
+
+## Actual Behavior
+<!--- Tell us what happens instead -->
+
+## Possible Fix
+<!--- Not obligatory, but suggest a fix or reason for the bug -->
+
+## Steps to Reproduce
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Existing issues
+<!-- Have you searched for any existing issues or are their any similar issues that you've found? -->
+- [ ] [Stack Overflow issues](http://stackoverflow.com/tags/hyperledger-caliper)
+- [ ] [GitHub Issues](https://github.com/hyperledger/caliper/issues)
+- [ ] [Rocket Chat history](https://chat.hyperledger.org/channel/caliper)
+
+<!-- please include any links to issues here -->
+
+## Context
+<!--- How has this bug affected you? What were you trying to accomplish? -->
+
+## Your Environment
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* Version used:
+* Environment name and version (e.g. Chrome 39, node.js 5.4):
+* Operating System and version (desktop or mobile):
+* Link to your project:

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,42 @@
+<!--- Provide a general summary of the pull request in the Title above -->
+
+## Checklist
+ - [ ]  A link to the issue/user story that the pull request relates to
+ - [ ]  How to recreate the problem without the fix
+ - [ ]  Design of the fix
+ - [ ]  How to prove that the fix works
+ - [ ]  Automated tests that prove the fix keeps on working
+ - [ ]  Documentation - any JSDoc, website, or Stackoverflow answers?
+
+
+## Issue/User story
+<!--- What issue / user story is this for -->
+
+## Steps to Reproduce
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+
+## Existing issues
+<!-- Have you searched for any existing issues or are their any similar issues that you've found? -->
+- [ ] [Stack Overflow issues](http://stackoverflow.com/tags/hyperledger-caliper)
+- [ ] [GitHub Issues](https://github.com/hyperledger/caliper/issues)
+- [ ] [Rocket Chat history](https://chat.hyperledger.org/channel/caliper)
+
+<!-- please include any links to issues here -->
+
+## Design of the fix
+<!-- Focus on why you designed this fix this way, and what was discounted. Do not describe just the code - we can read that! -->
+
+## Validation of the fix
+<!-- Over and above the tests, what has been done to prove this works? -->
+
+## Automated Tests
+<!-- Please describe the automated tests that are put in place to stop this recurring -->
+
+## What documentation has been provided for this pull request
+<!-- JSDocs, WebSite and answers to Stack Overflow questions are possible documentation sources -->

README.md

@@ -35,10 +35,10 @@ Run `npm install` in caliper folder to install dependencies locally
 
 ### Install blockchain SDKs
 * Fabric
-  * Install using the repository
-    * run `npm install grpc@1.10.1 fabric-ca-client fabric-client` in the root folder
-    * If you want to test fabric with old version such as v1.1.0, you should install compatible client SDK,  
-    e.g. `npm install fabric-ca-client@1.1.0 fabric-client@1.1.0` 
+  * Install using the repository (for the supported Fabric v1.1)
+    * run `npm install grpc@1.10.1 fabric-ca-client@1.1.0 fabric-client@1.1.0` in the root folder
+    * If you want to test Fabric with old version such as v1.0.0, you should install compatible client SDK,  
+    e.g. `npm install grpc@1.10.1 fabric-ca-client@1.0.0 fabric-client@1.0.0` 
 
 * Sawtooth
   * Install dependencies
@@ -55,6 +55,7 @@ Run `npm install` in caliper folder to install dependencies locally
 
 * Composer
    * Install dependencies
+
    The easiest way to get started using a target version of Composer is to update the main package.json file to include the required Composer and Fabric modules, and subsequently run an `npm install` command. It is important that the Composer and Fabric versions are compatible. 
 
    ```

benchmark/composer/composer-micro/query-asset.js

@@ -31,6 +31,7 @@
 'use strict';
 
 const Util = require('../../../src/comm/util');
+const logger = Util.getLogger('query-asset.js');
 const TxStatus = require('../../../src/comm/transaction');
 
 module.exports.info  = 'Query Asset Performance Test';
@@ -75,14 +76,17 @@ module.exports.init = async function(blockchain, context, args) {
         vehicles.push(vehicle);
     }
 
-    Util.log(`About to add ${vehicles.length} Vehicles to Asset Registry`);
+    logger.debug(`About to add ${vehicles.length} Vehicles to Asset Registry`);
     let vehicleRegistry = await busNetConnection.getAssetRegistry(vda_ns + '.Vehicle');
     await vehicleRegistry.addAll(vehicles);
 };
 
 module.exports.run = function() {
     let invoke_status = new TxStatus(qryRef++);
 
+    if(busNetConnection.engine) {
+        busNetConnection.engine.submitCallback(1);
+    }
     // use the pre-compiled query named 'selectAllCarsByColour' that is within the business
     // network queries file
     return busNetConnection.query('selectAllCarsByColour', { colour: matchColor})

benchmark/composer/composer-samples/basic-sample-network.js

@@ -36,7 +36,7 @@ module.exports.info  = 'Basic Sample Network Performance Test';
 
 const composerUtils = require('../../../src/composer/composer_utils');
 const removeExisting = require('../composer-test-utils').clearAll;
-const Log = require('../../../src/comm/util').log;
+const logger = require('../../../src/comm/util').getLogger('basic-sample-network.js');
 const os = require('os');
 
 const namespace = 'org.example.basic';
@@ -71,7 +71,7 @@ module.exports.init = async function(blockchain, context, args) {
             participant.lastName = 'wombat';
             await participantRegistry.add(participant);
 
-            Log('About to create new participant card');
+            logger.debug('About to create new participant card');
             let userName = 'User1_' + uuid;
             let newConnection = await composerUtils.obtainConnectionForParticipant(busNetConnections.get('admin'), busNetName, participant, userName);
             busNetConnections.set(userName, newConnection);
@@ -88,17 +88,17 @@ module.exports.init = async function(blockchain, context, args) {
         // Conditionally add/update Test Assets
         let populated = await assetRegistry.exists(assets[0].getIdentifier());
         if (!populated) {
-            Log('Adding test assets ...');
+            logger.debug('Adding test assets ...');
             await assetRegistry.addAll(assets);
-            Log('Asset addition complete ...');
+            logger.debug('Asset addition complete ...');
         } else {
-            Log('Updating test assets ...');
+            logger.debug('Updating test assets ...');
             await removeExisting(assetRegistry, 'ASSET_' + uuid);
             await assetRegistry.addAll(assets);
-            Log('Asset update complete ...');
+            logger.debug('Asset update complete ...');
         }
     } catch (error) {
-        Log('error in test init(): ', error);
+        logger.error('error in test init(): ', error);
         return Promise.reject(error);
     }
 };

benchmark/composer/composer-samples/bond-network.js

@@ -31,7 +31,7 @@
 'use strict';
 
 const removeExisting = require('../composer-test-utils').clearAll;
-const Log = require('../../../src/comm/util').log;
+const logger = require('../../../src/comm/util').getLogger('bond-network.js');
 const os = require('os');
 const uuid = os.hostname() + process.pid; // UUID for client within test
 
@@ -56,18 +56,18 @@ module.exports.init = async function(blockchain, context, args) {
         participant.name = 'penguin';
         let populated = await participantRegistry.exists(participant.getIdentifier());
         if (!populated) {
-            Log('Adding test assets ...');
+            logger.debug('Adding test assets ...');
             await participantRegistry.add(participant);
-            Log('Asset addition complete ...');
+            logger.debug('Asset addition complete ...');
         } else {
-            Log('Updating test assets ...');
+            logger.debug('Updating test assets ...');
             // remove all previously created items form test run
             let assetRegistry = await busNetConnection.getAssetRegistry(namespace + '.BondAsset');
             await removeExisting(assetRegistry, 'ISIN_' + uuid);
-            Log('Asset update complete ...');
+            logger.debug('Asset update complete ...');
         }
     } catch (error) {
-        Log('error in test init(): ', error);
+        logger.error('error in test init(): ', error);
         return Promise.reject(error);
     }
 };

benchmark/composer/composer-samples/digitalproperty-network.js

@@ -33,7 +33,7 @@
 'use strict';
 
 const removeExisting = require('../composer-test-utils').clearAll;
-const Log = require('../../../src/comm/util').log;
+const logger = require('../../../src/comm/util').getLogger('digitalproperty-network.js');
 const os = require('os');
 const uuid = os.hostname() + process.pid; // UUID for client within test
 
@@ -77,18 +77,18 @@ module.exports.init = async function(blockchain, context, args) {
         // Conditionally add/update Test Assets
         let populated = await assetRegistry.exists(assets[0].getIdentifier());
         if (!populated) {
-            Log('Adding test assets ...');
+            logger.debug('Adding test assets ...');
             await participantRegistry.addAll([participant]);
             await assetRegistry.addAll(assets);
-            Log('Asset addition complete ...');
+            logger.debug('Asset addition complete ...');
         } else {
-            Log('Updating test assets ...');
+            logger.debug('Updating test assets ...');
             await removeExisting(assetRegistry, 'TITLE_' + uuid);
             await assetRegistry.updateAll(assets);
-            Log('Asset update complete ...');
+            logger.debug('Asset update complete ...');
         }
     } catch (error) {
-        Log('error in test init(): ', error);
+        logger.error('error in test init(): ', error);
         return Promise.reject(error);
     }
 };

benchmark/composer/composer-samples/marbles-network.js

@@ -33,7 +33,7 @@
 'use strict';
 
 const removeExisting = require('../composer-test-utils').clearAll;
-const Log = require('../../../src/comm/util').log;
+const logger = require('../../../src/comm/util').getLogger('marbles-network.js');
 const os = require('os');
 const uuid = os.hostname() + process.pid; // UUID for client within test
 
@@ -79,18 +79,18 @@ module.exports.init = async function(blockchain, context, args) {
         // Conditionally add/update Test Assets
         let populated = await assetRegistry.exists(marbles[0].getIdentifier());
         if (!populated) {
-            Log('Adding test assets ...');
+            logger.debug('Adding test assets ...');
             await participantRegistry.addAll(players);
             await assetRegistry.addAll(marbles);
-            Log('Asset addition complete ...');
+            logger.debug('Asset addition complete ...');
         } else {
-            Log('Updating test assets ...');
+            logger.debug('Updating test assets ...');
             await removeExisting(assetRegistry, 'MARBLE_' + uuid);
             await assetRegistry.updateAll(marbles);
-            Log('Asset update complete ...');
+            logger.debug('Asset update complete ...');
         }
     } catch (error) {
-        Log('error in test init(): ', error);
+        logger.error('error in test init(): ', error);
         return Promise.reject(error);
     }
 };

benchmark/composer/composer-samples/perishable-network.js

@@ -33,7 +33,7 @@
 'use strict';
 
 const removeExisting = require('../composer-test-utils').clearAll;
-const Log = require('../../../src/comm/util').log;
+const logger = require('../../../src/comm/util').getLogger('perishable-network.js');
 const os = require('os');
 const uuid = os.hostname() + process.pid; // UUID for client within test
 
@@ -132,25 +132,25 @@ module.exports.init = async function(blockchain, context, args) {
         // Conditionally add/update registries
         let populated = await growerRegistry.exists(growers[0].getIdentifier());
         if (!populated) {
-            Log('Adding test assets ...');
+            logger.debug('Adding test assets ...');
             await growerRegistry.addAll(growers);
             await importerRegistry.addAll(importers);
             await shipperRegistry.addAll([shipper]);
             await contractRegistry.addAll(contracts);
             await shipmentRegistry.addAll(shipments);
-            Log('Asset addition complete ...');
+            logger.debug('Asset addition complete ...');
         } else {
-            Log('Updating test assets ...');
+            logger.debug('Updating test assets ...');
             await removeExisting(growerRegistry, 'Grower_' + uuid);
             await removeExisting(importerRegistry, 'Importer_' + uuid);
             await removeExisting(shipmentRegistry, 'SHIP_' + uuid);
             await growerRegistry.addAll(growers);
             await importerRegistry.addAll(importers);
             await shipmentRegistry.addAll(shipments);
-            Log('Asset update complete ...');
+            logger.debug('Asset update complete ...');
         }
     } catch (error) {
-        Log('error in test init(): ', error);
+        logger.error('error in test init(): ', error);
         return Promise.reject(error);
     }
 };

benchmark/composer/composer-samples/vehicle-lifecycle-network.js

@@ -51,7 +51,7 @@
 'use strict';
 
 const removeExisting = require('../composer-test-utils').clearAll;
-const Log = require('../../../src/comm/util').log;
+const logger = require('../../../src/comm/util').getLogger('vehicle-lifecycle-network.js');
 const os = require('os');
 const uuid = os.hostname() + process.pid; // UUID for client within test
 
@@ -143,15 +143,15 @@ module.exports.init = async function(blockchain, context, args) {
     try {
         if (!populated) {
             // First test pass, just add
-            Log('Adding test assets ...');
+            logger.debug('Adding test assets ...');
             await manufacturerRegistry.addAll(manufacturers);
             await ownerRegistry.addAll(privateOwners);
             await vehicleRegistry.addAll(vehicles);
             await orderRegistry.addAll(orders);
-            Log('Asset addition complete ...');
+            logger.debug('Asset addition complete ...');
         } else {
             // Second test pass, update/remove
-            Log('Updating test assets ...');
+            logger.debug('Updating test assets ...');
             await removeExisting(manufacturerRegistry, 'MANUFACTURER_' + uuid);
             await removeExisting(ownerRegistry, 'PRIVATEOWNER_' + uuid);
             await removeExisting(vehicleRegistry, 'VEHICLE_' + uuid);
@@ -160,10 +160,10 @@ module.exports.init = async function(blockchain, context, args) {
             await ownerRegistry.addAll(privateOwners);
             await vehicleRegistry.addAll(vehicles);
             await orderRegistry.addAll(orders);
-            Log('Asset update complete ...');
+            logger.debug('Asset update complete ...');
         }
     } catch (error) {
-        Log('error in test init(): ', error);
+        logger.error('error in test init(): ', error);
         return Promise.reject(error);
     }
 };