From 8c9fac5d0f54ea2be454d31fd620d20bf9a893ad Mon Sep 17 00:00:00 2001 From: "nkl199@yahoo.co.uk" Date: Wed, 3 Jun 2020 14:24:35 +0100 Subject: [PATCH] modify fabric config file for gateway Signed-off-by: nkl199@yahoo.co.uk --- lerna.json | 2 +- package.json | 2 +- packages/caliper-burrow/package.json | 4 ++-- packages/caliper-cli/package.json | 16 ++++++------- .../caliper-core/lib/common/config/Config.js | 4 ++-- .../lib/common/config/default.yaml | 5 ++-- packages/caliper-core/package.json | 2 +- packages/caliper-ethereum/package.json | 4 ++-- .../adaptor-versions/v1/fabric-gateway-v1.js | 24 +++++-------------- .../lib/adaptor-versions/v1/fabric-v1.js | 22 ++++------------- .../adaptor-versions/v2/fabric-gateway-v2.js | 24 +++++-------------- .../lib/adaptor-versions/v2/fabric-v2.js | 22 ++++------------- packages/caliper-fabric/lib/fabric.js | 11 +++++++-- packages/caliper-fabric/package.json | 4 ++-- packages/caliper-fisco-bcos/package.json | 4 ++-- packages/caliper-gui-dashboard/package.json | 2 +- packages/caliper-gui-server/package.json | 12 +++++----- packages/caliper-iroha/package.json | 4 ++-- packages/caliper-publish/package.json | 2 +- packages/caliper-sawtooth/package.json | 4 ++-- .../fabric_tests/run.sh | 6 ++--- .../caliper-tests-integration/package.json | 18 +++++++------- packages/generator-caliper/package.json | 2 +- 23 files changed, 80 insertions(+), 120 deletions(-) diff --git a/lerna.json b/lerna.json index d9212b896..3e424d15b 100644 --- a/lerna.json +++ b/lerna.json @@ -19,6 +19,6 @@ "packages/caliper-gui-server", "packages/generator-caliper" ], - "version": "0.3.2", + "version": "0.4.0-unstable", "hoist": true } diff --git a/package.json b/package.json index 62abc9a2c..dab75f06b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "caliper", "description": "Performance benchmarking for Hyperledger blockchain technologies. You must install [Lerna](https://lernajs.io) to build this multi-package repository.", - "version": "0.3.2", + "version": "0.4.0-unstable", "repository": { "type": "git", "url": "https://github.com/hyperledger/caliper" diff --git a/packages/caliper-burrow/package.json b/packages/caliper-burrow/package.json index 75d6cae86..2b98ff2ae 100644 --- a/packages/caliper-burrow/package.json +++ b/packages/caliper-burrow/package.json @@ -1,7 +1,7 @@ { "name": "@hyperledger/caliper-burrow", "description": "Hyperledger Burrow adaptor for Caliper, enabling the running of performance benchmarks that interact with Burrow", - "version": "0.3.2", + "version": "0.4.0-unstable", "repository": { "type": "git", "url": "https://github.com/hyperledger/caliper", @@ -22,7 +22,7 @@ "npm": ">=5.6.0" }, "dependencies": { - "@hyperledger/caliper-core": "0.3.2", + "@hyperledger/caliper-core": "0.4.0-unstable", "google-protobuf": "^3.11.4" }, "devDependencies": { diff --git a/packages/caliper-cli/package.json b/packages/caliper-cli/package.json index 92305e3f8..e6e71de6f 100644 --- a/packages/caliper-cli/package.json +++ b/packages/caliper-cli/package.json @@ -1,7 +1,7 @@ { "name": "@hyperledger/caliper-cli", "description": "Hyperledger Caliper CLI, for convenience running of a performance benchmark to test blockchain technologies", - "version": "0.3.2", + "version": "0.4.0-unstable", "repository": { "type": "git", "url": "https://github.com/hyperledger/caliper", @@ -26,13 +26,13 @@ "npm": ">=5.6.0" }, "dependencies": { - "@hyperledger/caliper-core": "0.3.2", - "@hyperledger/caliper-burrow": "0.3.2", - "@hyperledger/caliper-fabric": "0.3.2", - "@hyperledger/caliper-iroha": "0.3.2", - "@hyperledger/caliper-sawtooth": "0.3.2", - "@hyperledger/caliper-ethereum": "0.3.2", - "@hyperledger/caliper-fisco-bcos": "0.3.2", + "@hyperledger/caliper-core": "0.4.0-unstable", + "@hyperledger/caliper-burrow": "0.4.0-unstable", + "@hyperledger/caliper-fabric": "0.4.0-unstable", + "@hyperledger/caliper-iroha": "0.4.0-unstable", + "@hyperledger/caliper-sawtooth": "0.4.0-unstable", + "@hyperledger/caliper-ethereum": "0.4.0-unstable", + "@hyperledger/caliper-fisco-bcos": "0.4.0-unstable", "yargs": "15.3.1" }, "devDependencies": { diff --git a/packages/caliper-core/lib/common/config/Config.js b/packages/caliper-core/lib/common/config/Config.js index dc3ce7add..20efe25bf 100644 --- a/packages/caliper-core/lib/common/config/Config.js +++ b/packages/caliper-core/lib/common/config/Config.js @@ -132,10 +132,10 @@ const keys = { SkipCreateChannelPrefix: 'caliper-fabric-skipcreatechannel-', Gateway: { Discovery: 'caliper-fabric-gateway-discovery', + Enabled: 'caliper-fabric-gateway-enabled', EventStrategy: 'caliper-fabric-gateway-eventstrategy', - GatewayLocalHost: 'caliper-fabric-gateway-gatewaylocalhost', + LocalHost: 'caliper-fabric-gateway-localhost', QueryStrategy: 'caliper-fabric-gateway-querystrategy', - UseGateway: 'caliper-fabric-gateway-usegateway', } } }; diff --git a/packages/caliper-core/lib/common/config/default.yaml b/packages/caliper-core/lib/common/config/default.yaml index 1b6605467..49510fb06 100644 --- a/packages/caliper-core/lib/common/config/default.yaml +++ b/packages/caliper-core/lib/common/config/default.yaml @@ -187,9 +187,10 @@ caliper: countqueryasload: true # Settings for the Fabric Gateway API gateway: - usegateway: false + # Indicates whether to use the Fabric Gateway API + enabled: false # Indicates whether to use the localhost default within the Fabric Gateway API - gatewaylocalhost: true + localhost: true # Indicates whether to use the Fabric discovery mechanism (via Gateway API) discovery: false # Which event strategy to use diff --git a/packages/caliper-core/package.json b/packages/caliper-core/package.json index 651012bba..7bad5f185 100644 --- a/packages/caliper-core/package.json +++ b/packages/caliper-core/package.json @@ -1,7 +1,7 @@ { "name": "@hyperledger/caliper-core", "description": "Core Hyperledger Caliper module, used for running performance benchmarks that interact with blockchain technologies", - "version": "0.3.2", + "version": "0.4.0-unstable", "repository": { "type": "git", "url": "https://github.com/hyperledger/caliper", diff --git a/packages/caliper-ethereum/package.json b/packages/caliper-ethereum/package.json index 23706b6f3..bdbcfaa3a 100644 --- a/packages/caliper-ethereum/package.json +++ b/packages/caliper-ethereum/package.json @@ -1,7 +1,7 @@ { "name": "@hyperledger/caliper-ethereum", "description": "Ethereum adaptor for Caliper, enabling the running of performance benchmarks that interact with Ethereum", - "version": "0.3.2", + "version": "0.4.0-unstable", "repository": { "type": "git", "url": "https://github.com/hyperledger/caliper", @@ -22,7 +22,7 @@ "npm": ">=5.6.0" }, "dependencies": { - "@hyperledger/caliper-core": "0.3.2", + "@hyperledger/caliper-core": "0.4.0-unstable", "ethereumjs-wallet": "^0.6.3" }, "devDependencies": { diff --git a/packages/caliper-fabric/lib/adaptor-versions/v1/fabric-gateway-v1.js b/packages/caliper-fabric/lib/adaptor-versions/v1/fabric-gateway-v1.js index 9f96781e0..9dad9a21a 100644 --- a/packages/caliper-fabric/lib/adaptor-versions/v1/fabric-gateway-v1.js +++ b/packages/caliper-fabric/lib/adaptor-versions/v1/fabric-gateway-v1.js @@ -21,7 +21,6 @@ const { BlockchainInterface, CaliperUtils, TxStatus, ConfigUtil } = require('@hy const logger = CaliperUtils.getLogger('adapters/fabric'); const FabricNetwork = require('../../fabricNetwork.js'); -const ConfigValidator = require('../../configValidator.js'); const fs = require('fs'); const semver = require('semver'); @@ -132,26 +131,18 @@ const QueryStrategies = { class Fabric extends BlockchainInterface { /** * Initializes the Fabric adapter. - * @param {string|object} networkConfig The relative or absolute file path, or the object itself of the Common Connection Profile settings. + * @param {object} networkObject The parsed network configuration. * @param {string} workspace_root The absolute path to the root location for the application configuration files. * @param {number} clientIndex the client index */ - constructor(networkConfig, workspace_root, clientIndex) { - super(networkConfig); + constructor(networkObject, workspace_root, clientIndex) { + super(networkObject); this.bcType = 'fabric'; this.workspaceRoot = workspace_root; this.version = require('fabric-client/package').version; - this.network = undefined; - if (typeof networkConfig === 'string') { - const configPath = CaliperUtils.resolvePath(networkConfig, workspace_root); - this.network = CaliperUtils.parseYaml(configPath); - } else if (typeof networkConfig === 'object' && networkConfig !== null) { - // clone the object to prevent modification by other objects - this.network = CaliperUtils.parseYamlString(CaliperUtils.stringifyYaml(networkConfig)); - } else { - throw new Error('[FabricNetwork.constructor] Parameter \'networkConfig\' is neither a file path nor an object'); - } + // clone the object to prevent modification by other objects + this.network = CaliperUtils.parseYamlString(CaliperUtils.stringifyYaml(networkObject)); this.clientProfiles = new Map(); this.adminProfiles = new Map(); @@ -179,14 +170,11 @@ class Fabric extends BlockchainInterface { this.configCountQueryAsLoad = ConfigUtil.get(ConfigUtil.keys.Fabric.CountQueryAsLoad, true); // Gateway adaptor - this.configLocalHost = ConfigUtil.get(ConfigUtil.keys.Fabric.Gateway.GatewayLocalHost, true); + this.configLocalHost = ConfigUtil.get(ConfigUtil.keys.Fabric.Gateway.LocalHost, true); this.configDiscovery = ConfigUtil.get(ConfigUtil.keys.Fabric.Gateway.Discovery, false); this.eventStrategy = ConfigUtil.get(ConfigUtil.keys.Fabric.Gateway.EventStrategy, 'msp_all'); this.queryStrategy = ConfigUtil.get(ConfigUtil.keys.Fabric.Gateway.QueryStrategy, 'msp_single'); - ConfigValidator.validateNetwork(this.network, CaliperUtils.getFlowOptions(), - this.configDiscovery, true); - this.networkUtil = new FabricNetwork(this.network, workspace_root); this.fileWalletPath = this.networkUtil.getFileWalletPath(); this.defaultInvoker = Array.from(this.networkUtil.getClients())[0]; diff --git a/packages/caliper-fabric/lib/adaptor-versions/v1/fabric-v1.js b/packages/caliper-fabric/lib/adaptor-versions/v1/fabric-v1.js index d82ff573e..9c1cd4b9f 100644 --- a/packages/caliper-fabric/lib/adaptor-versions/v1/fabric-v1.js +++ b/packages/caliper-fabric/lib/adaptor-versions/v1/fabric-v1.js @@ -20,7 +20,6 @@ const {BlockchainInterface, CaliperUtils, TxStatus, Version, ConfigUtil} = requi const logger = CaliperUtils.getLogger('adapters/fabric'); const FabricNetwork = require('../../fabricNetwork.js'); -const ConfigValidator = require('../../configValidator.js'); const fs = require('fs'); @@ -126,26 +125,18 @@ const fs = require('fs'); class Fabric extends BlockchainInterface { /** * Initializes the Fabric adapter. - * @param {string|object} networkConfig The relative or absolute file path, or the object itself of the Common Connection Profile settings. + * @param {object} networkObject The parsed network configuration. * @param {string} workspace_root The absolute path to the root location for the application configuration files. * @param {number} clientIndex the client index */ - constructor(networkConfig, workspace_root, clientIndex) { - super(networkConfig); + constructor(networkObject, workspace_root, clientIndex) { + super(networkObject); this.bcType = 'fabric'; this.workspaceRoot = workspace_root; this.version = new Version(require('fabric-client/package').version); - this.network = undefined; - if (typeof networkConfig === 'string') { - const configPath = CaliperUtils.resolvePath(networkConfig, workspace_root); - this.network = CaliperUtils.parseYaml(configPath); - } else if (typeof networkConfig === 'object' && networkConfig !== null) { - // clone the object to prevent modification by other objects - this.network = CaliperUtils.parseYamlString(CaliperUtils.stringifyYaml(networkConfig)); - } else { - throw new Error('[FabricNetwork.constructor] Parameter \'networkConfig\' is neither a file path nor an object'); - } + // clone the object to prevent modification by other objects + this.network = CaliperUtils.parseYamlString(CaliperUtils.stringifyYaml(networkObject)); this.clientProfiles = new Map(); this.adminProfiles = new Map(); @@ -174,9 +165,6 @@ class Fabric extends BlockchainInterface { this.configClientBasedLoadBalancing = ConfigUtil.get(ConfigUtil.keys.Fabric.LoadBalancing, 'client') === 'client'; this.configCountQueryAsLoad = ConfigUtil.get(ConfigUtil.keys.Fabric.CountQueryAsLoad, true); - ConfigValidator.validateNetwork(this.network, CaliperUtils.getFlowOptions(), - this.configDiscovery, false); - this.networkUtil = new FabricNetwork(this.network, workspace_root); this.defaultInvoker = Array.from(this.networkUtil.getClients())[0]; diff --git a/packages/caliper-fabric/lib/adaptor-versions/v2/fabric-gateway-v2.js b/packages/caliper-fabric/lib/adaptor-versions/v2/fabric-gateway-v2.js index 0efbc0efb..694f7b773 100644 --- a/packages/caliper-fabric/lib/adaptor-versions/v2/fabric-gateway-v2.js +++ b/packages/caliper-fabric/lib/adaptor-versions/v2/fabric-gateway-v2.js @@ -18,7 +18,6 @@ const { DefaultEventHandlerStrategies, DefaultQueryHandlerStrategies, Gateway, W const { BlockchainInterface, CaliperUtils, TxStatus, Version, ConfigUtil } = require('@hyperledger/caliper-core'); const FabricNetwork = require('../../fabricNetwork.js'); -const ConfigValidator = require('../../configValidator.js'); const RegistrarHelper = require('./registrarHelper'); const logger = CaliperUtils.getLogger('adapters/fabric'); @@ -115,26 +114,18 @@ const QueryStrategies = { class Fabric extends BlockchainInterface { /** * Initializes the Fabric adapter. - * @param {string|object} networkConfig The relative or absolute file path, or the object itself of the Common Connection Profile settings. + * @param {object} networkObject The parsed network configuration. * @param {string} workspace_root The absolute path to the root location for the application configuration files. * @param {number} clientIndex the client index */ - constructor(networkConfig, workspace_root, clientIndex) { - super(networkConfig); + constructor(networkObject, workspace_root, clientIndex) { + super(networkObject); this.bcType = 'fabric'; this.workspaceRoot = workspace_root; this.version = new Version(require('fabric-network/package').version); - this.network = undefined; - if (typeof networkConfig === 'string') { - const configPath = CaliperUtils.resolvePath(networkConfig, workspace_root); - this.network = CaliperUtils.parseYaml(configPath); - } else if (typeof networkConfig === 'object' && networkConfig !== null) { - // clone the object to prevent modification by other objects - this.network = CaliperUtils.parseYamlString(CaliperUtils.stringifyYaml(networkConfig)); - } else { - throw new Error('[FabricNetwork.constructor] Parameter \'networkConfig\' is neither a file path nor an object'); - } + // clone the object to prevent modification by other objects + this.network = CaliperUtils.parseYamlString(CaliperUtils.stringifyYaml(networkObject)); this.clientIndex = clientIndex; this.txIndex = -1; @@ -152,13 +143,10 @@ class Fabric extends BlockchainInterface { this.configCountQueryAsLoad = ConfigUtil.get(ConfigUtil.keys.Fabric.CountQueryAsLoad, true); // Gateway adaptor - this.configLocalHost = ConfigUtil.get(ConfigUtil.keys.Fabric.Gateway.GatewayLocalHost, true); + this.configLocalHost = ConfigUtil.get(ConfigUtil.keys.Fabric.Gateway.LocalHost, true); this.configDiscovery = ConfigUtil.get(ConfigUtil.keys.Fabric.Gateway.Discovery, false); this.eventStrategy = ConfigUtil.get(ConfigUtil.keys.Fabric.Gateway.EventStrategy, 'msp_all'); this.queryStrategy = ConfigUtil.get(ConfigUtil.keys.Fabric.Gateway.QueryStrategy, 'msp_single'); - - // validate the network - ConfigValidator.validateNetwork(this.network, CaliperUtils.getFlowOptions(), this.configDiscovery, true); } //////////////////////////////// diff --git a/packages/caliper-fabric/lib/adaptor-versions/v2/fabric-v2.js b/packages/caliper-fabric/lib/adaptor-versions/v2/fabric-v2.js index 69e865041..bf5aa01b0 100644 --- a/packages/caliper-fabric/lib/adaptor-versions/v2/fabric-v2.js +++ b/packages/caliper-fabric/lib/adaptor-versions/v2/fabric-v2.js @@ -20,7 +20,6 @@ const {BlockchainInterface, CaliperUtils, TxStatus, Version, ConfigUtil} = requi const logger = CaliperUtils.getLogger('adapters/fabric'); const FabricNetwork = require('../../fabricNetwork.js'); -const ConfigValidator = require('../../configValidator.js'); const fs = require('fs'); @@ -126,26 +125,18 @@ const fs = require('fs'); class Fabric extends BlockchainInterface { /** * Initializes the Fabric adapter. - * @param {string|object} networkConfig The relative or absolute file path, or the object itself of the Common Connection Profile settings. + * @param {object} networkObject The parsed network configuration. * @param {string} workspace_root The absolute path to the root location for the application configuration files. * @param {number} clientIndex the client index */ - constructor(networkConfig, workspace_root, clientIndex) { - super(networkConfig); + constructor(networkObject, workspace_root, clientIndex) { + super(networkObject); this.bcType = 'fabric'; this.workspaceRoot = workspace_root; this.version = new Version(require('fabric-client/package').version); - this.network = undefined; - if (typeof networkConfig === 'string') { - const configPath = CaliperUtils.resolvePath(networkConfig, workspace_root); - this.network = CaliperUtils.parseYaml(configPath); - } else if (typeof networkConfig === 'object' && networkConfig !== null) { - // clone the object to prevent modification by other objects - this.network = CaliperUtils.parseYamlString(CaliperUtils.stringifyYaml(networkConfig)); - } else { - throw new Error('[FabricNetwork.constructor] Parameter \'networkConfig\' is neither a file path nor an object'); - } + // clone the object to prevent modification by other objects + this.network = CaliperUtils.parseYamlString(CaliperUtils.stringifyYaml(networkObject)); this.clientProfiles = new Map(); this.adminProfiles = new Map(); @@ -174,9 +165,6 @@ class Fabric extends BlockchainInterface { this.configClientBasedLoadBalancing = ConfigUtil.get(ConfigUtil.keys.Fabric.LoadBalancing, 'client') === 'client'; this.configCountQueryAsLoad = ConfigUtil.get(ConfigUtil.keys.Fabric.CountQueryAsLoad, true); - ConfigValidator.validateNetwork(this.network, CaliperUtils.getFlowOptions(), - this.configDiscovery, false); - this.networkUtil = new FabricNetwork(this.network, workspace_root); this.defaultInvoker = Array.from(this.networkUtil.getClients())[0]; diff --git a/packages/caliper-fabric/lib/fabric.js b/packages/caliper-fabric/lib/fabric.js index 0e44fe725..7d2c4d11e 100644 --- a/packages/caliper-fabric/lib/fabric.js +++ b/packages/caliper-fabric/lib/fabric.js @@ -15,6 +15,7 @@ 'use strict'; const { BlockchainInterface, CaliperUtils, ConfigUtil } = require('@hyperledger/caliper-core'); +const ConfigValidator = require('./configValidator.js'); const Logger = CaliperUtils.getLogger('adapters/fabric'); const semver = require('semver'); @@ -42,7 +43,8 @@ const Fabric = class extends BlockchainInterface { throw new Error(msg); } - const useGateway = ConfigUtil.get(ConfigUtil.keys.Fabric.Gateway.UseGateway, false); + const useGateway = ConfigUtil.get(ConfigUtil.keys.Fabric.Gateway.Enabled, false); + const useDiscovery = ConfigUtil.get(ConfigUtil.keys.Fabric.Gateway.Discovery, false); Logger.info(`Initializing ${useGateway ? 'gateway' : 'standard' } adaptor compatible with installed SDK: ${version}`); @@ -72,8 +74,13 @@ const Fabric = class extends BlockchainInterface { const networkConfig = CaliperUtils.resolvePath(ConfigUtil.get(ConfigUtil.keys.NetworkConfig)); const workspaceRoot = path.resolve(ConfigUtil.get(ConfigUtil.keys.Workspace)); + // validate the passed network file before use in underlying adaptor(s) + const configPath = CaliperUtils.resolvePath(networkConfig, workspaceRoot); + const networkObject = CaliperUtils.parseYaml(configPath); + ConfigValidator.validateNetwork(networkObject, CaliperUtils.getFlowOptions(), useDiscovery, useGateway); + const Fabric = require(modulePath); - this.fabric = new Fabric(networkConfig, workspaceRoot, workerIndex); + this.fabric = new Fabric(networkObject, workspaceRoot, workerIndex); } /** diff --git a/packages/caliper-fabric/package.json b/packages/caliper-fabric/package.json index a4d215000..c76b5a6db 100644 --- a/packages/caliper-fabric/package.json +++ b/packages/caliper-fabric/package.json @@ -1,7 +1,7 @@ { "name": "@hyperledger/caliper-fabric", "description": "Hyperledger Fabric adaptor for Caliper, enabling the running of performance benchmarks that interact with Fabric", - "version": "0.3.2", + "version": "0.4.0-unstable", "repository": { "type": "git", "url": "https://github.com/hyperledger/caliper", @@ -23,7 +23,7 @@ }, "dependencies": { "@hapi/joi": "^15.1.1", - "@hyperledger/caliper-core": "0.3.2", + "@hyperledger/caliper-core": "0.4.0-unstable", "semver": "7.1.1" }, "devDependencies": { diff --git a/packages/caliper-fisco-bcos/package.json b/packages/caliper-fisco-bcos/package.json index 39241c64e..64e199a26 100644 --- a/packages/caliper-fisco-bcos/package.json +++ b/packages/caliper-fisco-bcos/package.json @@ -1,6 +1,6 @@ { "name": "@hyperledger/caliper-fisco-bcos", - "version": "0.3.2", + "version": "0.4.0-unstable", "description": "FISCO BCOS adaptor for Caliper, enabling the running of a performance benchmarks that interact with FISCO BCOS", "repository": { "type": "git", @@ -22,7 +22,7 @@ "npm": ">=5.6.0" }, "dependencies": { - "@hyperledger/caliper-core": "0.3.2", + "@hyperledger/caliper-core": "0.4.0-unstable", "bn.js": "^4.11.8", "crypto-js": "^3.1.9-1", "ethereumjs-util": "^6.1.0", diff --git a/packages/caliper-gui-dashboard/package.json b/packages/caliper-gui-dashboard/package.json index 978ccf12d..939466e93 100755 --- a/packages/caliper-gui-dashboard/package.json +++ b/packages/caliper-gui-dashboard/package.json @@ -1,7 +1,7 @@ { "name": "@hyperledger/caliper-gui-dashboard", "description": "Hyperledger Caliper GUI dashboard module, for easily assembling configuration files and monitoring benchmark runs", - "version": "0.3.2", + "version": "0.4.0-unstable", "private": true, "repository": { "type": "git", diff --git a/packages/caliper-gui-server/package.json b/packages/caliper-gui-server/package.json index 4944d0b49..32c34f042 100644 --- a/packages/caliper-gui-server/package.json +++ b/packages/caliper-gui-server/package.json @@ -1,7 +1,7 @@ { "name": "@hyperledger/caliper-gui-server", "description": "Hyperledger Caliper GUI server module, for easily assembling configuration files and monitoring benchmark runs", - "version": "0.3.2", + "version": "0.4.0-unstable", "private": true, "repository": { "type": "git", @@ -22,11 +22,11 @@ "npm": ">=5.6.0" }, "dependencies": { - "@hyperledger/caliper-burrow": "0.3.2", - "@hyperledger/caliper-core": "0.3.2", - "@hyperledger/caliper-fabric": "0.3.2", - "@hyperledger/caliper-iroha": "0.3.2", - "@hyperledger/caliper-sawtooth": "0.3.2", + "@hyperledger/caliper-burrow": "0.4.0-unstable", + "@hyperledger/caliper-core": "0.4.0-unstable", + "@hyperledger/caliper-fabric": "0.4.0-unstable", + "@hyperledger/caliper-iroha": "0.4.0-unstable", + "@hyperledger/caliper-sawtooth": "0.4.0-unstable", "chalk": "1.1.3", "cors": "^2.8.5", "express": "^4.17.1", diff --git a/packages/caliper-iroha/package.json b/packages/caliper-iroha/package.json index e5a2a3718..82ed69c4f 100644 --- a/packages/caliper-iroha/package.json +++ b/packages/caliper-iroha/package.json @@ -1,7 +1,7 @@ { "name": "@hyperledger/caliper-iroha", "description": "Hyperledger Iroha adaptor for Caliper, enabling the running of performance benchmarks that interact with Iroha", - "version": "0.3.2", + "version": "0.4.0-unstable", "repository": { "type": "git", "url": "https://github.com/hyperledger/caliper", @@ -22,7 +22,7 @@ "npm": ">=5.6.0" }, "dependencies": { - "@hyperledger/caliper-core": "0.3.2" + "@hyperledger/caliper-core": "0.4.0-unstable" }, "devDependencies": { "iroha-helpers": "0.8.8", diff --git a/packages/caliper-publish/package.json b/packages/caliper-publish/package.json index 7a0821b0b..a46dce8ac 100644 --- a/packages/caliper-publish/package.json +++ b/packages/caliper-publish/package.json @@ -1,7 +1,7 @@ { "name": "caliper-publish", "description": "Hyperledger Caliper internal CLI for publishing packages", - "version": "0.3.2", + "version": "0.4.0-unstable", "private": true, "repository": { "type": "git", diff --git a/packages/caliper-sawtooth/package.json b/packages/caliper-sawtooth/package.json index a5d3c6e5f..6663a8cc2 100644 --- a/packages/caliper-sawtooth/package.json +++ b/packages/caliper-sawtooth/package.json @@ -1,7 +1,7 @@ { "name": "@hyperledger/caliper-sawtooth", "description": "Hyperledger Sawtooth adaptor for Caliper, enabling the running of performance benchmarks that interact with Sawtooth", - "version": "0.3.2", + "version": "0.4.0-unstable", "repository": { "type": "git", "url": "https://github.com/hyperledger/caliper", @@ -22,7 +22,7 @@ "npm": ">=5.6.0" }, "dependencies": { - "@hyperledger/caliper-core": "0.3.2", + "@hyperledger/caliper-core": "0.4.0-unstable", "request-promise": "^4.2.1", "protocol-buffers": "^4.1.0" }, diff --git a/packages/caliper-tests-integration/fabric_tests/run.sh b/packages/caliper-tests-integration/fabric_tests/run.sh index bf901dc19..e320591e4 100755 --- a/packages/caliper-tests-integration/fabric_tests/run.sh +++ b/packages/caliper-tests-integration/fabric_tests/run.sh @@ -87,7 +87,7 @@ if [[ ${rc} != 0 ]]; then fi # PHASE 5: testing through the gateway API -${CALL_METHOD} launch master --caliper-workspace phase5 --caliper-flow-only-test --caliper-fabric-gateway-usegateway +${CALL_METHOD} launch master --caliper-workspace phase5 --caliper-flow-only-test --caliper-fabric-gateway-enabled rc=$? if [[ ${rc} != 0 ]]; then echo "Failed CI step 6"; @@ -107,7 +107,7 @@ if [[ "${BIND_IN_PACKAGE_DIR}" = "true" ]]; then fi # PHASE 6: testing through the gateway API (v2 SDK) -${CALL_METHOD} launch master --caliper-workspace phase5 --caliper-flow-only-test --caliper-fabric-gateway-usegateway +${CALL_METHOD} launch master --caliper-workspace phase5 --caliper-flow-only-test --caliper-fabric-gateway-enabled rc=$? if [[ ${rc} != 0 ]]; then echo "Failed CI step 7"; @@ -116,7 +116,7 @@ if [[ ${rc} != 0 ]]; then fi # PHASE 7: just disposing of the network -${CALL_METHOD} launch master --caliper-workspace phase6 --caliper-flow-only-end --caliper-fabric-gateway-usegateway +${CALL_METHOD} launch master --caliper-workspace phase6 --caliper-flow-only-end --caliper-fabric-gateway-enabled rc=$? if [[ ${rc} != 0 ]]; then echo "Failed CI step 8"; diff --git a/packages/caliper-tests-integration/package.json b/packages/caliper-tests-integration/package.json index 427098d09..734bc8909 100644 --- a/packages/caliper-tests-integration/package.json +++ b/packages/caliper-tests-integration/package.json @@ -1,6 +1,6 @@ { "name": "caliper-tests-integration", - "version": "0.3.2", + "version": "0.4.0-unstable", "private": true, "description": "Integration tests for Hyperledger Caliper", "scripts": { @@ -31,14 +31,14 @@ "license-check-and-add": "2.3.6" }, "dependencies": { - "@hyperledger/caliper-burrow": "0.3.2", - "@hyperledger/caliper-cli": "0.3.2", - "@hyperledger/caliper-core": "0.3.2", - "@hyperledger/caliper-ethereum": "0.3.2", - "@hyperledger/caliper-fabric": "0.3.2", - "@hyperledger/caliper-fisco-bcos": "0.3.2", - "@hyperledger/caliper-iroha": "0.3.2", - "@hyperledger/caliper-sawtooth": "0.3.2", + "@hyperledger/caliper-burrow": "0.4.0-unstable", + "@hyperledger/caliper-cli": "0.4.0-unstable", + "@hyperledger/caliper-core": "0.4.0-unstable", + "@hyperledger/caliper-ethereum": "0.4.0-unstable", + "@hyperledger/caliper-fabric": "0.4.0-unstable", + "@hyperledger/caliper-fisco-bcos": "0.4.0-unstable", + "@hyperledger/caliper-iroha": "0.4.0-unstable", + "@hyperledger/caliper-sawtooth": "0.4.0-unstable", "yeoman-generator": "4.1.0", "yosay": "^2.0.1" }, diff --git a/packages/generator-caliper/package.json b/packages/generator-caliper/package.json index f23ce85f0..465b14925 100644 --- a/packages/generator-caliper/package.json +++ b/packages/generator-caliper/package.json @@ -1,7 +1,7 @@ { "name": "@hyperledger/generator-caliper", "description": "Yeoman generator for Hyperledger Caliper", - "version": "0.3.2", + "version": "0.4.0-unstable", "author": "Lynn Muswere", "homepage": "https://hyperledger.github.io/caliper/", "repository": {