From b32630de300760cae5b649f82468bcd99d303988 Mon Sep 17 00:00:00 2001 From: Simon Stone Date: Tue, 2 Jan 2018 08:28:01 +0000 Subject: [PATCH 1/2] Bump supported Composer version to v0.17.x Signed-off-by: Simon Stone --- packages/animaltracking-network/package.json | 14 +++++++------- packages/basic-sample-network/package.json | 12 ++++++------ packages/bond-network/package.json | 12 ++++++------ packages/carauction-network/package.json | 12 ++++++------ packages/digitalproperty-network/package.json | 14 +++++++------- packages/marbles-network/package.json | 12 ++++++------ packages/perishable-network/package.json | 12 ++++++------ packages/pii-network/package.json | 12 ++++++------ packages/trade-network/package.json | 12 ++++++------ packages/vehicle-lifecycle-network/package.json | 14 +++++++------- 10 files changed, 63 insertions(+), 63 deletions(-) diff --git a/packages/animaltracking-network/package.json b/packages/animaltracking-network/package.json index fd037c6..ca95a5c 100644 --- a/packages/animaltracking-network/package.json +++ b/packages/animaltracking-network/package.json @@ -1,6 +1,6 @@ { "engines": { - "composer": "^0.16.0" + "composer": "^0.17.0" }, "name": "animaltracking-network", "version": "0.2.0", @@ -35,11 +35,11 @@ ], "devDependencies": { "chai": "^3.5.0", - "composer-admin": "^0.16.0", - "composer-cli": "^0.16.0", - "composer-client": "^0.16.0", - "composer-common": "^0.16.0", - "composer-connector-embedded": "^0.16.0", + "composer-admin": "^0.17.0-0", + "composer-cli": "^0.17.0-0", + "composer-client": "^0.17.0-0", + "composer-common": "^0.17.0-0", + "composer-connector-embedded": "^0.17.0-0", "eslint": "^3.6.1", "jsdoc": "^3.5.5", "license-check": "^1.1.5", @@ -60,6 +60,6 @@ "logError": true }, "dependencies": { - "animaltracking-model": "^0.1.2" + "animaltracking-model": "^0.2.0" } } diff --git a/packages/basic-sample-network/package.json b/packages/basic-sample-network/package.json index 74505e8..a6ef84a 100644 --- a/packages/basic-sample-network/package.json +++ b/packages/basic-sample-network/package.json @@ -1,6 +1,6 @@ { "engines": { - "composer": "^0.16.0" + "composer": "^0.17.0" }, "name": "basic-sample-network", "version": "0.2.0", @@ -33,11 +33,11 @@ "devDependencies": { "chai": "^3.5.0", "chai-as-promised": "^6.0.0", - "composer-admin": "^0.16.0", - "composer-cli": "^0.16.0", - "composer-client": "^0.16.0", - "composer-connector-embedded": "^0.16.0", - "composer-cucumber-steps": "^0.16.0", + "composer-admin": "^0.17.0-0", + "composer-cli": "^0.17.0-0", + "composer-client": "^0.17.0-0", + "composer-connector-embedded": "^0.17.0-0", + "composer-cucumber-steps": "^0.17.0-0", "cucumber": "^2.2.0", "eslint": "^3.6.1", "istanbul": "^0.4.5", diff --git a/packages/bond-network/package.json b/packages/bond-network/package.json index 9771ab3..ec9f857 100644 --- a/packages/bond-network/package.json +++ b/packages/bond-network/package.json @@ -1,6 +1,6 @@ { "engines": { - "composer": "^0.16.0" + "composer": "^0.17.0" }, "name": "bond-network", "version": "0.2.0", @@ -33,11 +33,11 @@ "license": "Apache-2.0", "devDependencies": { "chai": "^3.5.0", - "composer-admin": "^0.16.0", - "composer-cli": "^0.16.0", - "composer-client": "^0.16.0", - "composer-common": "^0.16.0", - "composer-connector-embedded": "^0.16.0", + "composer-admin": "^0.17.0-0", + "composer-cli": "^0.17.0-0", + "composer-client": "^0.17.0-0", + "composer-common": "^0.17.0-0", + "composer-connector-embedded": "^0.17.0-0", "eslint": "^3.6.1", "istanbul": "^0.4.5", "jsdoc": "^3.5.5", diff --git a/packages/carauction-network/package.json b/packages/carauction-network/package.json index 8031c77..d37a19e 100644 --- a/packages/carauction-network/package.json +++ b/packages/carauction-network/package.json @@ -1,6 +1,6 @@ { "engines": { - "composer": "^0.16.0" + "composer": "^0.17.0" }, "name": "carauction-network", "version": "0.2.0", @@ -32,11 +32,11 @@ "license": "Apache-2.0", "devDependencies": { "chai": "^3.5.0", - "composer-admin": "^0.16.0", - "composer-cli": "^0.16.0", - "composer-client": "^0.16.0", - "composer-common": "^0.16.0", - "composer-connector-embedded": "^0.16.0", + "composer-admin": "^0.17.0-0", + "composer-cli": "^0.17.0-0", + "composer-client": "^0.17.0-0", + "composer-common": "^0.17.0-0", + "composer-connector-embedded": "^0.17.0-0", "eslint": "^3.6.1", "istanbul": "^0.4.5", "jsdoc": "^3.5.5", diff --git a/packages/digitalproperty-network/package.json b/packages/digitalproperty-network/package.json index cd5c5ba..a664695 100644 --- a/packages/digitalproperty-network/package.json +++ b/packages/digitalproperty-network/package.json @@ -1,6 +1,6 @@ { "engines": { - "composer": "^0.16.0" + "composer": "^0.17.0" }, "name": "digitalproperty-network", "version": "0.2.0", @@ -31,11 +31,11 @@ "license": "Apache-2.0", "devDependencies": { "chai": "^3.5.0", - "composer-admin": "^0.16.0", - "composer-cli": "^0.16.0", - "composer-client": "^0.16.0", - "composer-common": "^0.16.0", - "composer-connector-embedded": "^0.16.0", + "composer-admin": "^0.17.0-0", + "composer-cli": "^0.17.0-0", + "composer-client": "^0.17.0-0", + "composer-common": "^0.17.0-0", + "composer-connector-embedded": "^0.17.0-0", "eslint": "^3.6.1", "istanbul": "^0.4.5", "jsdoc": "^3.5.5", @@ -45,7 +45,7 @@ "moment": "^2.17.1" }, "dependencies": { - "digitalproperty-model": "^0.1.2" + "digitalproperty-model": "^0.2.0" }, "license-check-config": { "src": [ diff --git a/packages/marbles-network/package.json b/packages/marbles-network/package.json index 09ffa3f..6e31c59 100644 --- a/packages/marbles-network/package.json +++ b/packages/marbles-network/package.json @@ -1,6 +1,6 @@ { "engines": { - "composer": "^0.16.0" + "composer": "^0.17.0" }, "name": "marbles-network", "version": "0.2.0", @@ -32,11 +32,11 @@ "license": "Apache-2.0", "devDependencies": { "chai": "^3.5.0", - "composer-admin": "^0.16.0", - "composer-cli": "^0.16.0", - "composer-client": "^0.16.0", - "composer-common": "^0.16.0", - "composer-connector-embedded": "^0.16.0", + "composer-admin": "^0.17.0-0", + "composer-cli": "^0.17.0-0", + "composer-client": "^0.17.0-0", + "composer-common": "^0.17.0-0", + "composer-connector-embedded": "^0.17.0-0", "eslint": "^3.6.1", "istanbul": "^0.4.5", "jsdoc": "^3.5.5", diff --git a/packages/perishable-network/package.json b/packages/perishable-network/package.json index c2e533f..f2511f6 100644 --- a/packages/perishable-network/package.json +++ b/packages/perishable-network/package.json @@ -1,6 +1,6 @@ { "engines": { - "composer": "^0.16.0" + "composer": "^0.17.0" }, "name": "perishable-network", "version": "0.2.0", @@ -33,11 +33,11 @@ "license": "Apache-2.0", "devDependencies": { "chai": "^3.5.0", - "composer-admin": "^0.16.0", - "composer-cli": "^0.16.0", - "composer-client": "^0.16.0", - "composer-common": "^0.16.0", - "composer-connector-embedded": "^0.16.0", + "composer-admin": "^0.17.0-0", + "composer-cli": "^0.17.0-0", + "composer-client": "^0.17.0-0", + "composer-common": "^0.17.0-0", + "composer-connector-embedded": "^0.17.0-0", "eslint": "^3.6.1", "istanbul": "^0.4.5", "jsdoc": "^3.5.5", diff --git a/packages/pii-network/package.json b/packages/pii-network/package.json index bec37ec..cabfbbb 100644 --- a/packages/pii-network/package.json +++ b/packages/pii-network/package.json @@ -1,6 +1,6 @@ { "engines": { - "composer": "^0.16.0" + "composer": "^0.17.0" }, "name": "pii-network", "version": "0.2.0", @@ -32,11 +32,11 @@ "license": "Apache-2.0", "devDependencies": { "chai": "^3.5.0", - "composer-admin": "^0.16.0", - "composer-cli": "^0.16.0", - "composer-client": "^0.16.0", - "composer-common": "^0.16.0", - "composer-connector-embedded": "^0.16.0", + "composer-admin": "^0.17.0-0", + "composer-cli": "^0.17.0-0", + "composer-client": "^0.17.0-0", + "composer-common": "^0.17.0-0", + "composer-connector-embedded": "^0.17.0-0", "eslint": "^3.6.1", "istanbul": "^0.4.5", "jsdoc": "^3.5.5", diff --git a/packages/trade-network/package.json b/packages/trade-network/package.json index 8ba3229..14b2f43 100644 --- a/packages/trade-network/package.json +++ b/packages/trade-network/package.json @@ -1,6 +1,6 @@ { "engines": { - "composer": "^0.16.0" + "composer": "^0.17.0" }, "name": "trade-network", "version": "0.2.0", @@ -32,11 +32,11 @@ "license": "Apache-2.0", "devDependencies": { "chai": "^3.5.0", - "composer-admin": "^0.16.0", - "composer-cli": "^0.16.0", - "composer-client": "^0.16.0", - "composer-common": "^0.16.0", - "composer-connector-embedded": "^0.16.0", + "composer-admin": "^0.17.0-0", + "composer-cli": "^0.17.0-0", + "composer-client": "^0.17.0-0", + "composer-common": "^0.17.0-0", + "composer-connector-embedded": "^0.17.0-0", "eslint": "^3.6.1", "istanbul": "^0.4.5", "jsdoc": "^3.5.5", diff --git a/packages/vehicle-lifecycle-network/package.json b/packages/vehicle-lifecycle-network/package.json index 45fdd1f..afbc406 100644 --- a/packages/vehicle-lifecycle-network/package.json +++ b/packages/vehicle-lifecycle-network/package.json @@ -1,6 +1,6 @@ { "engines": { - "composer": "^0.16.0" + "composer": "^0.17.0" }, "name": "vehicle-lifecycle-network", "version": "0.2.0", @@ -31,15 +31,15 @@ "author": "Hyperledger Composer", "license": "Apache-2.0", "dependencies": { - "vehicle-lifecycle-model": "^0.1.2" + "vehicle-lifecycle-model": "^0.2.0" }, "devDependencies": { "chai": "^3.5.0", - "composer-admin": "^0.16.0", - "composer-cli": "^0.16.0", - "composer-client": "^0.16.0", - "composer-common": "^0.16.0", - "composer-connector-embedded": "^0.16.0", + "composer-admin": "^0.17.0-0", + "composer-cli": "^0.17.0-0", + "composer-client": "^0.17.0-0", + "composer-common": "^0.17.0-0", + "composer-connector-embedded": "^0.17.0-0", "eslint": "^3.6.1", "istanbul": "^0.4.5", "jsdoc": "^3.5.5", From c426e8d789c982cc88d47bd2ee4e8938e4a7cb13 Mon Sep 17 00:00:00 2001 From: Simon Stone Date: Tue, 2 Jan 2018 08:59:45 +0000 Subject: [PATCH 2/2] Fix unit tests to work with Composer v0.17.x Signed-off-by: Simon Stone --- packages/animaltracking-network/test/mozart.cto.js | 2 +- packages/basic-sample-network/test/sample.js | 2 +- packages/bond-network/test/Bond.js | 2 +- packages/carauction-network/test/CarAuction.js | 2 +- packages/digitalproperty-network/test/DigitalLandTitle.js | 2 +- packages/marbles-network/test/MarblesTests.js | 2 +- packages/perishable-network/test/perishable.js | 2 +- packages/pii-network/test/pii.js | 2 +- packages/trade-network/test/trading.js | 2 +- packages/vehicle-lifecycle-network/test/util.js | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/animaltracking-network/test/mozart.cto.js b/packages/animaltracking-network/test/mozart.cto.js index 7386c4f..c2d1d6c 100644 --- a/packages/animaltracking-network/test/mozart.cto.js +++ b/packages/animaltracking-network/test/mozart.cto.js @@ -39,7 +39,7 @@ describe('Animal Tracking Network', function() { // Embedded connection used for local testing const connectionProfile = { name: 'embedded', - type: 'embedded' + 'x-type': 'embedded' }; // Embedded connection does not need real credentials const credentials = { diff --git a/packages/basic-sample-network/test/sample.js b/packages/basic-sample-network/test/sample.js index 44dc015..f9241d4 100644 --- a/packages/basic-sample-network/test/sample.js +++ b/packages/basic-sample-network/test/sample.js @@ -32,7 +32,7 @@ describe('Sample', () => { // Embedded connection used for local testing const connectionProfile = { name: 'embedded', - type: 'embedded' + 'x-type': 'embedded' }; // Name of the business network card containing the administrative identity for the business network diff --git a/packages/bond-network/test/Bond.js b/packages/bond-network/test/Bond.js index 236220c..e21a0d0 100644 --- a/packages/bond-network/test/Bond.js +++ b/packages/bond-network/test/Bond.js @@ -35,7 +35,7 @@ describe('Publish Bond', () => { // Embedded connection used for local testing const connectionProfile = { name: 'embedded', - type: 'embedded' + 'x-type': 'embedded' }; // Embedded connection does not need real credentials const credentials = { diff --git a/packages/carauction-network/test/CarAuction.js b/packages/carauction-network/test/CarAuction.js index 1947fcf..e064109 100644 --- a/packages/carauction-network/test/CarAuction.js +++ b/packages/carauction-network/test/CarAuction.js @@ -35,7 +35,7 @@ describe('CarAuction', () => { // Embedded connection used for local testing const connectionProfile = { name: 'embedded', - type: 'embedded' + 'x-type': 'embedded' }; // Embedded connection does not need real credentials const credentials = { diff --git a/packages/digitalproperty-network/test/DigitalLandTitle.js b/packages/digitalproperty-network/test/DigitalLandTitle.js index 77f45c6..3481003 100644 --- a/packages/digitalproperty-network/test/DigitalLandTitle.js +++ b/packages/digitalproperty-network/test/DigitalLandTitle.js @@ -33,7 +33,7 @@ describe('DigitalLandTitle', () => { // Embedded connection used for local testing const connectionProfile = { name: 'embedded', - type: 'embedded' + 'x-type': 'embedded' }; // Embedded connection does not need real credentials const credentials = { diff --git a/packages/marbles-network/test/MarblesTests.js b/packages/marbles-network/test/MarblesTests.js index e7ca0ae..0c8a369 100644 --- a/packages/marbles-network/test/MarblesTests.js +++ b/packages/marbles-network/test/MarblesTests.js @@ -35,7 +35,7 @@ describe('Marbles', () => { // Embedded connection used for local testing const connectionProfile = { name: 'embedded', - type: 'embedded' + 'x-type': 'embedded' }; // Embedded connection does not need real credentials const credentials = { diff --git a/packages/perishable-network/test/perishable.js b/packages/perishable-network/test/perishable.js index 2352571..28a627f 100644 --- a/packages/perishable-network/test/perishable.js +++ b/packages/perishable-network/test/perishable.js @@ -40,7 +40,7 @@ describe('Perishable Shipping Network', () => { // Embedded connection used for local testing const connectionProfile = { name: 'embedded', - type: 'embedded' + 'x-type': 'embedded' }; // Embedded connection does not need real credentials const credentials = { diff --git a/packages/pii-network/test/pii.js b/packages/pii-network/test/pii.js index e07b8ce..e8f7478 100644 --- a/packages/pii-network/test/pii.js +++ b/packages/pii-network/test/pii.js @@ -32,7 +32,7 @@ describe('Acl checking', () => { // Embedded connection used for local testing const connectionProfile = { name: 'embedded', - type: 'embedded' + 'x-type': 'embedded' }; // Name of the business network card containing the administrative identity for the business network diff --git a/packages/trade-network/test/trading.js b/packages/trade-network/test/trading.js index a941bf4..867def3 100644 --- a/packages/trade-network/test/trading.js +++ b/packages/trade-network/test/trading.js @@ -35,7 +35,7 @@ describe('Commodity Trading', () => { // Embedded connection used for local testing const connectionProfile = { name: 'embedded', - type: 'embedded' + 'x-type': 'embedded' }; // Embedded connection does not need real credentials const credentials = { diff --git a/packages/vehicle-lifecycle-network/test/util.js b/packages/vehicle-lifecycle-network/test/util.js index 2878bf6..8b730fe 100644 --- a/packages/vehicle-lifecycle-network/test/util.js +++ b/packages/vehicle-lifecycle-network/test/util.js @@ -140,7 +140,7 @@ function getAdminConnection() { const connectionProfile = { name: 'embedded', - type: 'embedded' + 'x-type': 'embedded' }; const credentials = { certificate: 'FAKE CERTIFICATE',