Bump version to v0.18.0 (#148)

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
hyperledger-archives · Feb 28, 2018 · 20b334b · 20b334b
1 parent 29bfb27
commit 20b334b
Show file tree

Hide file tree

Showing 22 changed files with 97 additions and 154 deletions.
diff --git a/packages/animaltracking-network/package.json b/packages/animaltracking-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "animaltracking-network",
   "version": "0.2.2",
@@ -35,11 +35,11 @@
   ],
   "devDependencies": {
     "chai": "^3.5.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",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-common": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
     "eslint": "^3.6.1",
     "jsdoc": "^3.5.5",
     "license-check": "^1.1.5",

diff --git a/packages/animaltracking-network/test/mozart.cto.js b/packages/animaltracking-network/test/mozart.cto.js
@@ -16,11 +16,8 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
-
 const Util = require('./util');
 
 const namespace = 'com.biz';
@@ -41,11 +38,8 @@ describe('Animal Tracking Network', function() {
             name: 'embedded',
             'x-type': 'embedded'
         };
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // PeerAdmin identity used with the admin connection to deploy business networks
         const deployerMetadata = {

diff --git a/packages/basic-sample-network/package.json b/packages/basic-sample-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "basic-sample-network",
   "version": "0.2.2",
@@ -33,11 +33,11 @@
   "devDependencies": {
     "chai": "^3.5.0",
     "chai-as-promised": "^6.0.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",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
+    "composer-cucumber-steps": "^0.18.0-0",
     "cucumber": "^2.2.0",
     "eslint": "^3.6.1",
     "istanbul": "^0.4.5",

diff --git a/packages/basic-sample-network/test/sample.js b/packages/basic-sample-network/test/sample.js
@@ -16,9 +16,7 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
 
 const chai = require('chai');
@@ -57,11 +55,8 @@ describe('Sample', () => {
     let businessNetworkName;
 
     before(async () => {
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // Identity used with the admin connection to deploy business networks
         const deployerMetadata = {

diff --git a/packages/bond-network/package.json b/packages/bond-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "bond-network",
   "version": "0.2.2",
@@ -33,11 +33,11 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "chai": "^3.5.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",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-common": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
     "eslint": "^3.6.1",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.5.5",

diff --git a/packages/bond-network/test/Bond.js b/packages/bond-network/test/Bond.js
@@ -16,9 +16,7 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
 
 require('chai').should();
@@ -37,11 +35,8 @@ describe('Publish Bond', () => {
             name: 'embedded',
             'x-type': 'embedded'
         };
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // PeerAdmin identity used with the admin connection to deploy business networks
         const deployerMetadata = {

diff --git a/packages/carauction-network/package.json b/packages/carauction-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "carauction-network",
   "version": "0.2.2",
@@ -32,11 +32,11 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "chai": "^3.5.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",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-common": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
     "eslint": "^3.6.1",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.5.5",

diff --git a/packages/carauction-network/test/CarAuction.js b/packages/carauction-network/test/CarAuction.js
@@ -16,9 +16,7 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
 
 require('chai').should();
@@ -37,11 +35,8 @@ describe('CarAuction', () => {
             name: 'embedded',
             'x-type': 'embedded'
         };
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // PeerAdmin identity used with the admin connection to deploy business networks
         const deployerMetadata = {

diff --git a/packages/digitalproperty-network/package.json b/packages/digitalproperty-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "digitalproperty-network",
   "version": "0.2.2",
@@ -31,11 +31,11 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "chai": "^3.5.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",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-common": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
     "eslint": "^3.6.1",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.5.5",

diff --git a/packages/digitalproperty-network/test/DigitalLandTitle.js b/packages/digitalproperty-network/test/DigitalLandTitle.js
@@ -16,9 +16,7 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
 
 require('chai').should();
@@ -35,11 +33,8 @@ describe('DigitalLandTitle', () => {
             name: 'embedded',
             'x-type': 'embedded'
         };
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // PeerAdmin identity used with the admin connection to deploy business networks
         const deployerMetadata = {

diff --git a/packages/marbles-network/package.json b/packages/marbles-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "marbles-network",
   "version": "0.2.2",
@@ -32,11 +32,11 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "chai": "^3.5.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",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-common": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
     "eslint": "^3.6.1",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.5.5",

diff --git a/packages/marbles-network/test/MarblesTests.js b/packages/marbles-network/test/MarblesTests.js
@@ -16,9 +16,7 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
 
 require('chai').should();
@@ -37,11 +35,8 @@ describe('Marbles', () => {
             name: 'embedded',
             'x-type': 'embedded'
         };
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // PeerAdmin identity used with the admin connection to deploy business networks
         const deployerMetadata = {

diff --git a/packages/perishable-network/package.json b/packages/perishable-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "perishable-network",
   "version": "0.2.2",
@@ -33,11 +33,11 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "chai": "^3.5.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",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-common": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
     "eslint": "^3.6.1",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.5.5",

diff --git a/packages/perishable-network/test/perishable.js b/packages/perishable-network/test/perishable.js
@@ -16,9 +16,7 @@
 
 const AdminConnection = require('composer-admin').AdminConnection;
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
-const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
-const IdCard = require('composer-common').IdCard;
-const MemoryCardStore = require('composer-common').MemoryCardStore;
+const { BusinessNetworkDefinition, CertificateUtil, IdCard, MemoryCardStore } = require('composer-common');
 const path = require('path');
 
 require('chai').should();
@@ -42,11 +40,8 @@ describe('Perishable Shipping Network', () => {
             name: 'embedded',
             'x-type': 'embedded'
         };
-        // Embedded connection does not need real credentials
-        const credentials = {
-            certificate: 'FAKE CERTIFICATE',
-            privateKey: 'FAKE PRIVATE KEY'
-        };
+        // Generate certificates for use with the embedded connection
+        const credentials = CertificateUtil.generate({ commonName: 'admin' });
 
         // PeerAdmin identity used with the admin connection to deploy business networks
         const deployerMetadata = {

diff --git a/packages/pii-network/package.json b/packages/pii-network/package.json
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "composer": "^0.17.0"
+    "composer": "^0.18.0"
   },
   "name": "pii-network",
   "version": "0.2.2",
@@ -32,11 +32,11 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "chai": "^3.5.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",
+    "composer-admin": "^0.18.0-0",
+    "composer-cli": "^0.18.0-0",
+    "composer-client": "^0.18.0-0",
+    "composer-common": "^0.18.0-0",
+    "composer-connector-embedded": "^0.18.0-0",
     "eslint": "^3.6.1",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.5.5",