From e84821637c1bce5ffe900062f7a017754d117534 Mon Sep 17 00:00:00 2001 From: ratnakar Date: Tue, 19 Dec 2017 14:17:18 -0500 Subject: [PATCH] [FAB-7511] clear crypto material after clearing network Crypto materal is cleared after every re-start of a new network Change-Id: I01c919109401428de1252695930f42e73eb3f795 Signed-off-by: ratnakar --- balance-transfer/config.js | 6 +++--- balance-transfer/runApp.sh | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/balance-transfer/config.js b/balance-transfer/config.js index d4436ed561..a3d1baa04b 100644 --- a/balance-transfer/config.js +++ b/balance-transfer/config.js @@ -11,8 +11,8 @@ else file = util.format(file, ''); // indicate to the application where the setup file is located so it able // to have the hfc load it to initalize the fabric client instance -hfc.setConfigSetting('network-connection-profile-path',path.join(__dirname, 'app', '../artifacts',file)); -hfc.setConfigSetting('Org1-connection-profile-path',path.join(__dirname, 'app', '../artifacts','org1.yaml')); -hfc.setConfigSetting('Org2-connection-profile-path',path.join(__dirname, 'app', '../artifacts','org2.yaml')); +hfc.setConfigSetting('network-connection-profile-path',path.join(__dirname, 'artifacts' ,file)); +hfc.setConfigSetting('Org1-connection-profile-path',path.join(__dirname, 'artifacts', 'org1.yaml')); +hfc.setConfigSetting('Org2-connection-profile-path',path.join(__dirname, 'artifacts', 'org2.yaml')); // some other settings the application might need to know hfc.addConfigFile(path.join(__dirname, 'config.json')); diff --git a/balance-transfer/runApp.sh b/balance-transfer/runApp.sh index 59ca5f2a6d..e1e7d3028e 100755 --- a/balance-transfer/runApp.sh +++ b/balance-transfer/runApp.sh @@ -30,9 +30,8 @@ function dkrm(){ function restartNetwork() { echo - #teardown the network and clean the containers and intermediate images - cd artifacts - docker-compose down + #teardown the network and clean the containers and intermediate images + docker-compose -f ./artifacts/docker-compose.yaml down dkcl dkrm @@ -40,8 +39,7 @@ function restartNetwork() { rm -rf ./fabric-client-kv-org* #Start the network - docker-compose up -d - cd - + docker-compose -f ./artifacts/docker-compose.yaml up -d echo }