From 3079cb1844b6f2724e945d5ca42c059aacb6fe74 Mon Sep 17 00:00:00 2001
From: Dave Kelsey <d_kelsey@uk.ibm.com>
Date: Wed, 7 Feb 2018 15:37:42 +0000
Subject: [PATCH] Address CCP modification introduced.

Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
---
 .../composer-connector-hlfv1/lib/hlfconnectionmanager.js  | 1 +
 .../composer-connector-hlfv1/test/hlfconnectionmanager.js | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/composer-connector-hlfv1/lib/hlfconnectionmanager.js b/packages/composer-connector-hlfv1/lib/hlfconnectionmanager.js
index d9a8ff1428..ea670a0cb3 100644
--- 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
index cf5ef7f524..c1372dcb3e 100644
--- 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);
         });