Skip to content
This repository has been archived by the owner on Mar 8, 2020. It is now read-only.

Address CCP modification introduced. #3354

Merged
merged 3 commits into from
Feb 7, 2018
Merged

Address CCP modification introduced. #3354

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3079cb1
Address CCP modification introduced.
Feb 7, 2018
978ab56
Merge branch 'master' into fixCCPMod
Feb 7, 2018
e584d02
Merge branch 'master' into fixCCPMod
Feb 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/composer-connector-hlfv1/lib/hlfconnectionmanager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ class HLFConnectionManager extends ConnectionManager {
await HLFConnectionManager.setupWallet(client, wallet);
} else {
await client.initCredentialStores();
delete ccp.client.credentialStore;
}
}
} catch(err) {
Expand Down
8 changes: 5 additions & 3 deletions packages/composer-connector-hlfv1/test/hlfconnectionmanager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down Expand Up @@ -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);
});
Expand Down