Address CCP modification introduced. (hyperledger-archives#3354)

Signed-off-by: Dave Kelsey <[email protected]>
RajDkJangam · Feb 7, 2018 · 3ed5816 · 3ed5816
1 parent 626caf2
commit 3ed5816
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/composer-connector-hlfv1/lib/hlfconnectionmanager.js b/packages/composer-connector-hlfv1/lib/hlfconnectionmanager.js
@@ -95,6 +95,7 @@ class HLFConnectionManager extends ConnectionManager {
                     await HLFConnectionManager.setupWallet(client, wallet);
                 } else {
                     await client.initCredentialStores();
+                    delete ccp.client.credentialStore;
                 }
             }
         } catch(err) {

diff --git a/packages/composer-connector-hlfv1/test/hlfconnectionmanager.js b/packages/composer-connector-hlfv1/test/hlfconnectionmanager.js
@@ -31,7 +31,7 @@ const Wallet = require('composer-common').Wallet;
 const fsextra = require('fs-extra');
 
 const chai = require('chai');
-chai.should();
+const should = chai.should();
 chai.use(require('chai-as-promised'));
 const sinon = require('sinon');
 
@@ -166,12 +166,14 @@ describe('HLFConnectionManager', () => {
             sandbox.stub(Client, 'loadFromConfig').withArgs(ccp).returns(mockClient);
             sandbox.stub(Wallet, 'getWallet').returns(null);
             sandbox.stub(HLFConnectionManager, 'setupWallet').resolves();
+            sandbox.stub(path, 'join').returns('something');
             let client = await HLFConnectionManager.createClient(ccp, true);
             client.should.be.an.instanceOf(Client);
+            should.not.exist(ccp.client.credentialStore);
 
             sinon.assert.calledOnce(Client.loadFromConfig);
-            sinon.assert.calledWith(Client.loadFromConfig, sinon.match.has('client', sinon.match.has('credentialStore', sinon.match.has('path', sinon.match(/composer\/client-data\/acard/)))));
-            sinon.assert.calledWith(Client.loadFromConfig, sinon.match.has('client', sinon.match.has('credentialStore', sinon.match.has('cryptoStore', sinon.match.has('path', sinon.match(/composer\/client-data\/acard/))))));
+            sinon.assert.calledOnce(path.join);
+            sinon.assert.calledWith(path.join, sinon.match.any, sinon.match.string, sinon.match.string, 'acard');
             sinon.assert.notCalled(HLFConnectionManager.setupWallet);
             sinon.assert.calledOnce(mockClient.initCredentialStores);
         });