hyperledger-archives · sstone1 · Jul 23, 2017 · Jul 21, 2017 · Jul 21, 2017 · Jul 22, 2017
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "lerna": "2.0.0-rc.4",
+  "lerna": "2.0.0",
   "packages": [
     "packages/*"
   ],

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "devDependencies": {
     "colors": "^1.1.2",
-    "lerna": "^2.0.0-rc.4",
+    "lerna": "^2.0.0",
     "licensecheck": "^1.3.0",
     "moment": "^2.17.1",
     "semver": "^5.3.0",
@@ -32,4 +32,4 @@
   ],
   "author": "Hyperledger Composer",
   "license": "Apache-2.0"
-}
+}
diff --git a/packages/composer-admin/package.json b/packages/composer-admin/package.json
@@ -36,10 +36,9 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2"
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
+    "sinon": "^2.3.8"
   },
   "dependencies": {
     "composer-common": "0.10.1",

diff --git a/packages/composer-admin/test/adminconnection.js b/packages/composer-admin/test/adminconnection.js
@@ -30,7 +30,6 @@ const should = chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
 
 describe('AdminConnection', () => {
 

diff --git a/packages/composer-cli/lib/cmds/identity/importCommand.js b/packages/composer-cli/lib/cmds/identity/importCommand.js
@@ -26,12 +26,5 @@ module.exports.builder = {
 };
 
 module.exports.handler = (argv) => {
-    argv.thePromise =  Import.handler(argv)
-    .then(() => {
-        return;
-    })
-    .catch((error) => {
-        throw error;
-    });
-    return argv.thePromise;
+    return Import.handler(argv);
 };
diff --git a/packages/composer-cli/package.json b/packages/composer-cli/package.json
@@ -34,10 +34,9 @@
     "chai-things": "^0.2.0",
     "eslint": "^3.17.1",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2"
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
+    "sinon": "^2.3.8"
   },
   "dependencies": {
     "chalk": "^1.1.3",

diff --git a/packages/composer-cli/test/archive/create.js b/packages/composer-cli/test/archive/create.js
@@ -26,7 +26,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/archive/list.js b/packages/composer-cli/test/archive/list.js
@@ -26,7 +26,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/generator/createCode.js b/packages/composer-cli/test/generator/createCode.js
@@ -36,7 +36,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/identity/bind.js b/packages/composer-cli/test/identity/bind.js
@@ -21,7 +21,6 @@ const Bind = require('../../lib/cmds/identity/bindCommand.js');
 const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');
 
 const sinon = require('sinon');
-require('sinon-as-promised');
 const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/identity/import.js b/packages/composer-cli/test/identity/import.js
@@ -21,7 +21,6 @@ const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');
 const fs = require('fs');
 
 const sinon = require('sinon');
-require('sinon-as-promised');
 const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
@@ -75,7 +74,7 @@ describe('composer identity import CLI unit tests', () => {
 
         let fsStub = sandbox.stub(fs, 'readFileSync').withArgs(CERT_PATH).returns('acert');
         fsStub.withArgs(KEY_PATH).returns('akey');
-        mockAdminConnection.importIdentity.withArgs(PROFILE_NAME, USER_ID, 'acert', 'akey').rejects('some error');
+        mockAdminConnection.importIdentity.withArgs(PROFILE_NAME, USER_ID, 'acert', 'akey').rejects('Error', 'some error');
         return Import.handler(argv)
             .should.be.rejectedWith(/some error/);
     });

diff --git a/packages/composer-cli/test/identity/issue.js b/packages/composer-cli/test/identity/issue.js
@@ -21,7 +21,6 @@ const Issue = require('../../lib/cmds/identity/issueCommand.js');
 const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');
 
 const sinon = require('sinon');
-require('sinon-as-promised');
 const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/identity/revoke.js b/packages/composer-cli/test/identity/revoke.js
@@ -21,7 +21,6 @@ const Revoke = require('../../lib/cmds/identity/revokeCommand.js');
 const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');
 
 const sinon = require('sinon');
-require('sinon-as-promised');
 const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/index.js b/packages/composer-cli/test/index.js
@@ -22,7 +22,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/network/deploy.js b/packages/composer-cli/test/network/deploy.js
@@ -27,7 +27,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/network/download.js b/packages/composer-cli/test/network/download.js
@@ -28,7 +28,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/network/list.js b/packages/composer-cli/test/network/list.js
@@ -29,7 +29,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/network/loglevel.js b/packages/composer-cli/test/network/loglevel.js
@@ -20,7 +20,6 @@ const LogLevel = require('../../lib/cmds/network/loglevelCommand.js');
 const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');
 
 const sinon = require('sinon');
-require('sinon-as-promised');
 const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/network/ping.js b/packages/composer-cli/test/network/ping.js
@@ -21,7 +21,6 @@ const Ping = require('../../lib/cmds/network/pingCommand.js');
 const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');
 
 const sinon = require('sinon');
-require('sinon-as-promised');
 
 const BUSINESS_NETWORK_NAME = 'net.biz.TestNetwork-0.0.1';
 const DEFAULT_PROFILE_NAME = 'defaultProfile';

diff --git a/packages/composer-cli/test/network/start.js b/packages/composer-cli/test/network/start.js
@@ -25,7 +25,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/network/undeploy.js b/packages/composer-cli/test/network/undeploy.js
@@ -24,7 +24,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/participant/add.js b/packages/composer-cli/test/participant/add.js
@@ -27,7 +27,6 @@ const Add = require('../../lib/cmds/participant/addCommand.js');
 const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');
 
 const sinon = require('sinon');
-require('sinon-as-promised');
 const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/runtime/install.js b/packages/composer-cli/test/runtime/install.js
@@ -24,7 +24,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/shell/shelltest.js b/packages/composer-cli/test/shell/shelltest.js
@@ -26,7 +26,6 @@ require('chai').should();
 
 const chai = require('chai');
 const sinon = require('sinon');
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/transaction/submit.js b/packages/composer-cli/test/transaction/submit.js
@@ -28,7 +28,6 @@ const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');
 const chai = require('chai');
 const sinon = require('sinon');
 
-require('sinon-as-promised');
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-cli/test/utils/cmdutils.js b/packages/composer-cli/test/utils/cmdutils.js
@@ -20,7 +20,7 @@ const fs = require('fs');
 const chai = require('chai');
 const sinon = require('sinon');
 
-require('sinon-as-promised');
+
 chai.should();
 chai.use(require('chai-things'));
 chai.use(require('chai-as-promised'));

diff --git a/packages/composer-client/package.json b/packages/composer-client/package.json
@@ -54,10 +54,9 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2"
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
+    "sinon": "^2.3.8"
   },
   "nyc": {
     "exclude": [

diff --git a/packages/composer-client/test/assetregistry.js b/packages/composer-client/test/assetregistry.js
@@ -27,7 +27,7 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('AssetRegistry', () => {
 

diff --git a/packages/composer-client/test/businessnetworkconnection.js b/packages/composer-client/test/businessnetworkconnection.js
@@ -40,7 +40,7 @@ const chai = require('chai');
 const should = chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('BusinessNetworkConnection', () => {
 

diff --git a/packages/composer-client/test/participantregistry.js b/packages/composer-client/test/participantregistry.js
@@ -27,7 +27,7 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('ParticipantRegistry', () => {
 

diff --git a/packages/composer-client/test/registry.js b/packages/composer-client/test/registry.js
@@ -27,7 +27,7 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('Registry', () => {
 

diff --git a/packages/composer-common/package.json b/packages/composer-common/package.json
@@ -44,12 +44,11 @@
     "folder-zip-sync": "^1.0.4",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
+    "mocha": "^3.4.2",
     "mockery": "^2.0.0",
-    "nyc": "^10.1.2",
+    "nyc": "^11.1.0",
     "pegjs": "^0.9.0",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2"
+    "sinon": "^2.3.8"
   },
   "dependencies": {
     "acorn": "^4.0.3",

diff --git a/packages/composer-common/test/comboconnectionprofilestore.js b/packages/composer-common/test/comboconnectionprofilestore.js
@@ -21,7 +21,6 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
 
 describe('ComboConnectionProfileStore', () => {
 

diff --git a/packages/composer-common/test/fsconnectionprofilestore.js b/packages/composer-common/test/fsconnectionprofilestore.js
@@ -27,7 +27,6 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
 
 [homedir(), null].forEach((homedir) => {
 

diff --git a/packages/composer-common/test/memoryconnectionprofilestore.js b/packages/composer-common/test/memoryconnectionprofilestore.js
@@ -27,7 +27,6 @@ chai.should();
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-things'));
 const sinon = require('sinon');
-require('sinon-as-promised');
 
 describe('MemoryConnectionProfileStore', () => {
 

diff --git a/packages/composer-connector-embedded/package.json b/packages/composer-connector-embedded/package.json
@@ -45,10 +45,9 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2",
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
+    "sinon": "^2.3.8",
     "watchify": "^3.7.0"
   },
   "dependencies": {

diff --git a/packages/composer-connector-embedded/test/embeddedconnection.js b/packages/composer-connector-embedded/test/embeddedconnection.js
@@ -31,7 +31,7 @@ const chai = require('chai');
 const should = chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('EmbeddedConnection', () => {
 

diff --git a/packages/composer-connector-embedded/test/embeddedconnectionmanager.js b/packages/composer-connector-embedded/test/embeddedconnectionmanager.js
@@ -25,7 +25,7 @@ const chai = require('chai');
 chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('EmbeddedConnectionManager', () => {
 

diff --git a/packages/composer-connector-hlf/package.json b/packages/composer-connector-hlf/package.json
@@ -54,10 +54,9 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2"
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
+    "sinon": "^2.3.8"
   },
   "nyc": {
     "exclude": [

diff --git a/packages/composer-connector-hlf/test/hfcconnection.js b/packages/composer-connector-hlf/test/hfcconnection.js
@@ -32,7 +32,7 @@ const chai = require('chai');
 const should = chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
-require('sinon-as-promised');
+
 
 describe('HFCConnection', () => {