diff --git a/app.js b/app.js index 3fc40a24b..2473cd27a 100644 --- a/app.js +++ b/app.js @@ -199,8 +199,8 @@ function setup_marbles_lib() { broadcast_state('no_chaincode'); } else { //else we already deployed - console.log(''); - logger.debug('Chaincode already deployed\n\n'); + + console.log('\n------------------------------------------ Chaincode Found ------------------------------------------\n'); broadcast_state('found_chaincode'); var user_base = null; diff --git a/chaincode/src/marbles/lib_marbles.go b/chaincode/src/marbles/lib_marbles.go index e2a0d30aa..8df4f4b47 100644 --- a/chaincode/src/marbles/lib_marbles.go +++ b/chaincode/src/marbles/lib_marbles.go @@ -69,7 +69,7 @@ func get_complete_marble_index(stub shim.ChaincodeStubInterface) ([]string, erro //append to array completedMarbleIndex = append(completedMarbleIndex, owner.Marbles...) //add this owner's marble list to complete list - fmt.Println("marble index so far - ", completedMarbleIndex) + //fmt.Println("marble index so far - ", completedMarbleIndex) } return completedMarbleIndex, nil diff --git a/utils/helper.js b/utils/helper.js index 3c4153a55..a6039013b 100644 --- a/utils/helper.js +++ b/utils/helper.js @@ -160,7 +160,10 @@ module.exports = function (config_filename, logger) { // get the status of marbles previous startup helper.getEventsSetting = function () { - return getMarblesField('use_events'); + if (helper.config['use_events']) { + return helper.config['use_events']; + } + return false; }; // safely retrieve marbles fields diff --git a/utils/marbles_cc_lib.js b/utils/marbles_cc_lib.js index c28372d8a..2764d46bc 100644 --- a/utils/marbles_cc_lib.js +++ b/utils/marbles_cc_lib.js @@ -12,7 +12,7 @@ module.exports = function (enrollObj, g_options, logger) { //check chaincode marbles_chaincode.check_if_already_deployed = function (options, cb) { - logger.info('checking for chaincode...'); + logger.info('Checking for chaincode...'); var opts = { channel_id: g_options.channel_id, @@ -41,7 +41,7 @@ module.exports = function (enrollObj, g_options, logger) { //create a marble marbles_chaincode.create_a_marble = function (options, cb) { - logger.info('creating a marble...'); + logger.info('Creating a marble...'); var opts = { channel_id: g_options.channel_id, @@ -65,7 +65,7 @@ module.exports = function (enrollObj, g_options, logger) { //get list of marbles marbles_chaincode.get_marble_list = function (options, cb) { - logger.info('fetching marble index list...'); + logger.info('Fetching marble index list...'); var opts = { channel_id: g_options.channel_id, @@ -93,7 +93,7 @@ module.exports = function (enrollObj, g_options, logger) { //set marble owner marbles_chaincode.set_marble_owner = function (options, cb) { - logger.info('setting marble owner...'); + logger.info('Setting marble owner...'); var opts = { channel_id: g_options.channel_id, @@ -115,7 +115,7 @@ module.exports = function (enrollObj, g_options, logger) { //delete marble marbles_chaincode.delete_marble = function (options, cb) { - logger.info('deleting a marble...'); + logger.info('Deleting a marble...'); var opts = { channel_id: g_options.channel_id,