Skip to content

Commit

Permalink
fix(v1): address minor issue in setup-utils (hyperledger-archives#680)
Browse files Browse the repository at this point in the history
Signed-off-by: Dave Kelsey <[email protected]>
  • Loading branch information
Dave Kelsey authored Apr 12, 2017
1 parent 2bcd114 commit 52f32f2
Showing 1 changed file with 6 additions and 18 deletions.
24 changes: 6 additions & 18 deletions packages/composer-systests/hlfv1/setup-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,6 @@ let hfc = require('fabric-client');
let copService = require('fabric-ca-client/lib/FabricCAClientImpl.js');
let User = require('fabric-client/lib/User.js');

module.exports.END2END = {
channel: 'mychannel',
chaincodeId: 'end2end',
chaincodeVersion: 'v0'
};

// directory for file based KeyValueStore
module.exports.KVS = '/tmp/hfc-test-kvs';
module.exports.storePathForOrg = function (org) {
return module.exports.KVS + '_' + org;
};

// temporarily set $GOPATH to the test fixture folder
module.exports.setupChaincodeDeploy = function () {
process.env.GOPATH = path.join(__dirname, '../fixtures');
};

// specifically set the values to defaults because they may have been overridden when
// running in the overall test bucket ('gulp test')
module.exports.resetDefaults = function () {
Expand Down Expand Up @@ -68,8 +51,13 @@ module.exports.existsSync = function (absolutePath /*string*/) {
}
};

let useTls = process.env.SYSTEST.match('tls$');

hfc.addConfigFile(path.join(__dirname, './config.json'));
if (useTls) {
hfc.addConfigFile(path.join(__dirname, './config.tls.json'));
} else {
hfc.addConfigFile(path.join(__dirname, './config.json'));
}
let ORGS = hfc.getConfigSetting('test-network');

/**
Expand Down

0 comments on commit 52f32f2

Please sign in to comment.