Merge branch 'master' of https://github.com/fabric-composer/fabric-co…

…mposer
mttrbrts · Mar 11, 2017 · 9442d0b · 9442d0b
2 parents 4c4defa + 7c75409
commit 9442d0b
Show file tree

Hide file tree

Showing 30 changed files with 155 additions and 124 deletions.
diff --git a/lerna.json b/lerna.json
@@ -3,5 +3,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.4.5"
+  "version": "0.5.0"
 }
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
   },
   "name": "fabric-composer",
   "description": "You must install [Lerna](https://lernajs.io) to build this multi-package repository.",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "main": "index.js",
   "private": true,
   "scripts": {

diff --git a/packages/composer-admin/package.json b/packages/composer-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-admin",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "Fabric Composer Admin, code that manages business networks deployed to Hyperledger Fabric",
   "engines": {
     "node": ">=6",
@@ -47,8 +47,8 @@
     "sinon-as-promised": "^4.0.2"
   },
   "dependencies": {
-    "composer-common": "^0.4.5",
-    "composer-connector-hlf": "^0.4.5"
+    "composer-common": "^0.5.0",
+    "composer-connector-hlf": "^0.5.0"
   },
   "license-check-config": {
     "src": [

diff --git a/packages/composer-cli/package.json b/packages/composer-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-cli",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "Fabric Composer command line interfaces (CLIs)",
   "engines": {
     "node": ">=6",
@@ -41,9 +41,9 @@
     "sinon-as-promised": "^4.0.2"
   },
   "dependencies": {
-    "composer-admin": "^0.4.5",
-    "composer-client": "^0.4.5",
-    "composer-common": "^0.4.5",
+    "composer-admin": "^0.5.0",
+    "composer-client": "^0.5.0",
+    "composer-common": "^0.5.0",
     "homedir": "^0.6.0",
     "moment": "^2.17.1",
     "npm-paths": "^0.1.3",

diff --git a/packages/composer-client/package.json b/packages/composer-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-client",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "The node.js client library for Fabric Composer, a development framework for Hyperledger Fabric",
   "engines": {
     "node": ">=6",
@@ -43,8 +43,8 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "^0.4.5",
-    "composer-connector-hlf": "^0.4.5",
+    "composer-common": "^0.5.0",
+    "composer-connector-hlf": "^0.5.0",
     "uuid": "^3.0.0"
   },
   "devDependencies": {

diff --git a/packages/composer-common/package.json b/packages/composer-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-common",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "Fabric Composer Common, code that is common across client, admin and runtime.",
   "engines": {
     "node": ">=6",

diff --git a/packages/composer-connector-embedded/package.json b/packages/composer-connector-embedded/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-embedded",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "The embedded client connector for Fabric Composer",
   "engines": {
     "node": ">=6",
@@ -53,8 +53,8 @@
     "watchify": "^3.7.0"
   },
   "dependencies": {
-    "composer-common": "^0.4.5",
-    "composer-runtime": "^0.4.5",
-    "composer-runtime-embedded": "^0.4.5"
+    "composer-common": "^0.5.0",
+    "composer-runtime": "^0.5.0",
+    "composer-runtime-embedded": "^0.5.0"
   }
 }
diff --git a/packages/composer-connector-hlf/lib/hfcconnection.js b/packages/composer-connector-hlf/lib/hfcconnection.js
@@ -212,7 +212,7 @@ class HFCConnection extends Connection {
             })
             .then(() => {
                 return HFCUtil
-                    .invokeChainCode(securityContext, 'undeploy', [businessNetworkIdentifier]);
+                    .invokeChainCode(securityContext, 'undeployBusinessNetwork', []);
             })
             .then(() => {
                 try {

diff --git a/packages/composer-connector-hlf/package.json b/packages/composer-connector-hlf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-hlf",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "The Hyperledger Fabric Client connector for Fabric Composer",
   "engines": {
     "node": ">=6",
@@ -41,8 +41,8 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "^0.4.5",
-    "composer-runtime-hlf": "^0.4.5",
+    "composer-common": "^0.5.0",
+    "composer-runtime-hlf": "^0.5.0",
     "fs-extra": "^1.0.0",
     "hfc": "^0.6.5",
     "semver": "^5.3.0",

diff --git a/packages/composer-connector-hlf/test/hfcconnection.js b/packages/composer-connector-hlf/test/hfcconnection.js
@@ -403,6 +403,18 @@ describe('HFCConnection', () => {
                 });
             }).should.throw(/Business network id must be specified/);
         });
+
+        it('should make the correct call to the runtime', () => {
+            connection = new HFCConnection(mockConnectionManager, 'testprofile', null, mockChain, connectOptions);
+            sandbox.stub(HFCUtil, 'invokeChainCode');
+
+            return connection.undeploy(mockSecurityContext, 'testnetwork')
+            .then(() => {
+                sinon.assert.calledOnce(HFCUtil.invokeChainCode);
+                sinon.assert.calledWith(HFCUtil.invokeChainCode, mockSecurityContext, 'undeployBusinessNetwork', []);
+            });
+
+        });
     });
 
     describe('#update', function() {

diff --git a/packages/composer-connector-hlfv1/package.json b/packages/composer-connector-hlfv1/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-hlfv1",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "The Hyperledger Fabric v1.x Client connector for Fabric Composer",
   "engines": {
     "node": ">=6",
@@ -42,8 +42,8 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "^0.4.5",
-    "composer-runtime-hlfv1": "^0.4.5",
+    "composer-common": "^0.5.0",
+    "composer-runtime-hlfv1": "^0.5.0",
     "fabric-sdk-node": "davidkel/fabric-sdk-node#Tested020317",
     "fs-extra": "^1.0.0",
     "semver": "^5.3.0",

diff --git a/packages/composer-connector-proxy/package.json b/packages/composer-connector-proxy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-proxy",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "The proxying client connector for Fabric Composer",
   "engines": {
     "node": ">=6",
@@ -54,7 +54,7 @@
     "watchify": "^3.7.0"
   },
   "dependencies": {
-    "composer-common": "^0.4.5",
+    "composer-common": "^0.5.0",
     "socket.io-client": "^1.7.2"
   }
 }
diff --git a/packages/composer-connector-server/package.json b/packages/composer-connector-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-server",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "The remote connector server for Fabric Composer",
   "engines": {
     "node": ">=6",
@@ -45,9 +45,9 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "^0.4.5",
-    "composer-connector-embedded": "^0.4.5",
-    "composer-connector-hlf": "^0.4.5",
+    "composer-common": "^0.5.0",
+    "composer-connector-embedded": "^0.5.0",
+    "composer-connector-hlf": "^0.5.0",
     "serializerr": "^1.0.3",
     "socket.io": "^1.7.2",
     "uuid": "^3.0.1",

diff --git a/packages/composer-connector-web/package.json b/packages/composer-connector-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-web",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "The web client connector for Fabric Composer",
   "engines": {
     "node": ">=6",
@@ -63,8 +63,8 @@
     "watchify": "^3.7.0"
   },
   "dependencies": {
-    "composer-common": "^0.4.5",
-    "composer-runtime": "^0.4.5",
-    "composer-runtime-web": "^0.4.5"
+    "composer-common": "^0.5.0",
+    "composer-runtime": "^0.5.0",
+    "composer-runtime-web": "^0.5.0"
   }
 }
diff --git a/packages/composer-playground-api/package.json b/packages/composer-playground-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-playground-api",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "The REST API for the Fabric Composer Playground",
   "engines": {
     "node": ">=6",
@@ -59,8 +59,8 @@
   },
   "dependencies": {
     "body-parser": "^1.16.1",
-    "composer-common": "^0.4.5",
-    "composer-connector-server": "^0.4.5",
+    "composer-common": "^0.5.0",
+    "composer-connector-server": "^0.5.0",
     "dotenv": "^4.0.0",
     "express": "^4.14.1",
     "http-status": "^1.0.1",

diff --git a/packages/composer-playground/package.json b/packages/composer-playground/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-playground",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "A test harness/UI for the web runtime container for Fabric Composer",
   "engines": {
     "node": ">=6",
@@ -73,8 +73,8 @@
   },
   "dependencies": {
     "@ng-bootstrap/ng-bootstrap": "^1.0.0-alpha.20",
-    "composer-common": "^0.4.5",
-    "composer-playground-api": "^0.4.5",
+    "composer-common": "^0.5.0",
+    "composer-playground-api": "^0.5.0",
     "express": "^4.14.0",
     "file-saver": "^1.3.3",
     "is-docker": "^1.1.0",
@@ -120,12 +120,12 @@
     "browserfs": "^1.1.0",
     "codelyzer": "^2.0.0-beta.4",
     "codemirror": "^5.22.0",
-    "composer-admin": "^0.4.5",
-    "composer-client": "^0.4.5",
-    "composer-connector-proxy": "^0.4.5",
-    "composer-connector-web": "^0.4.5",
-    "composer-runtime": "^0.4.5",
-    "composer-runtime-web": "^0.4.5",
+    "composer-admin": "^0.5.0",
+    "composer-client": "^0.5.0",
+    "composer-connector-proxy": "^0.5.0",
+    "composer-connector-web": "^0.5.0",
+    "composer-runtime": "^0.5.0",
+    "composer-runtime-web": "^0.5.0",
     "copy-webpack-plugin": "^4.0.1",
     "core-js": "^2.4.1",
     "css-loader": "^0.26.1",

diff --git a/packages/composer-rest-server/package.json b/packages/composer-rest-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-rest-server",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "Fabric Composer REST server that uses the Fabric Composer LoopBack connector",
   "engines": {
     "node": ">=6",
@@ -43,7 +43,7 @@
     "loopback": "^3.0.0",
     "loopback-boot": "^2.6.5",
     "loopback-component-explorer": "^4.1.0",
-    "loopback-connector-composer": "^0.4.5",
+    "loopback-connector-composer": "^0.5.0",
     "serve-favicon": "^2.0.1",
     "strong-error-handler": "^1.0.1",
     "touch": "^1.0.0",

diff --git a/packages/composer-runtime-embedded/package.json b/packages/composer-runtime-embedded/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-runtime-embedded",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "The embedded runtime container for Fabric Composer",
   "engines": {
     "node": ">=6",
@@ -54,7 +54,7 @@
     "logError": true
   },
   "dependencies": {
-    "composer-runtime": "^0.4.5",
+    "composer-runtime": "^0.5.0",
     "dexie": "^1.5.1",
     "fake-indexeddb": "^1.0.8",
     "uuid": "^3.0.1"

diff --git a/packages/composer-runtime-hlf/package.json b/packages/composer-runtime-hlf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-runtime-hlf",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "The Hyperledger Fabric runtime container for Fabric Composer",
   "engines": {
     "node": ">=6",
@@ -24,7 +24,7 @@
   "license": "Apache-2.0",
   "dependencies": {},
   "devDependencies": {
-    "composer-runtime": "^0.4.5",
+    "composer-runtime": "^0.5.0",
     "babel-polyfill": "^6.20.0",
     "babel-preset-es2015": "^6.18.0",
     "babelify": "^7.3.0",

diff --git a/packages/composer-runtime-hlfv1/package.json b/packages/composer-runtime-hlfv1/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-runtime-hlfv1",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "The Hyperledger Fabric v1.x runtime container for Fabric Composer",
   "engines": {
     "node": ">=6",
@@ -24,7 +24,7 @@
   "license": "Apache-2.0",
   "dependencies": {},
   "devDependencies": {
-    "composer-runtime": "^0.4.5",
+    "composer-runtime": "^0.5.0",
     "babel-polyfill": "^6.20.0",
     "babel-preset-es2015": "^6.18.0",
     "babelify": "^7.3.0",

diff --git a/packages/composer-runtime-web/package.json b/packages/composer-runtime-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-runtime-web",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "The web runtime container for Fabric Composer",
   "engines": {
     "node": ">=6",
@@ -63,7 +63,7 @@
     "logError": true
   },
   "dependencies": {
-    "composer-runtime": "^0.4.5",
+    "composer-runtime": "^0.5.0",
     "dexie": "^1.5.1",
     "uuid": "^3.0.1"
   }

diff --git a/packages/composer-runtime/lib/context.js b/packages/composer-runtime/lib/context.js
@@ -81,15 +81,16 @@ class Context {
         return this.getDataService().getCollection('$sysdata')
             .then((collection) => {
 
-                // check if the network has been undeployed first. if is has throw exception.
-                if (collection.undeployed){
-                    throw new Error('Network has already been undeployed');
-                }
-
                 LOG.debug(method, 'Getting business network archive from the $sysdata collection');
                 return collection.get('businessnetwork');
             })
             .then((object) => {
+
+                // check if the network has been undeployed first. if is has throw exception.
+                if (object.undeployed){
+                    throw new Error('Network has already been undeployed');
+                }
+
                 LOG.debug(method, 'Looking in cache for business network', object.hash);
                 let businessNetworkDefinition = businessNetworkCache.get(object.hash);
                 if (businessNetworkDefinition) {