Merge "[FAB-6870] Update node modules versions"

hyperledger · Nov 6, 2017 · b09febd · b09febd
2 parents 7c23985 + 1961835
commit b09febd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,8 +20,10 @@ chaincode-docker-devmode/chaincode/chaincode_example02/chaincode_example02
 # fabric sdk node modules
 fabcar/node_modules/
 fabcar/package-lock.json
+fabcar/hfc-key-store/
 
 # balance transfer sample
 balance-transfer/.DS_Store
 balance-transfer/node_modules/*
 balance-transfer/package-lock.json
+balance-transfer/fabric-client-kv-org*
diff --git a/chaincode/fabcar/node/package.json b/chaincode/fabcar/node/package.json
@@ -6,7 +6,9 @@
 		"node": ">=8.4.0",
 		"npm": ">=5.3.0"
 	},
-	"scripts": { "start" : "node fabcar.js" },
+	"scripts": {
+		"start": "node fabcar.js"
+	},
 	"engine-strict": true,
 	"license": "Apache-2.0",
 	"dependencies": {

diff --git a/fabcar/package.json b/fabcar/package.json
@@ -7,8 +7,8 @@
         "test": "echo \"Error: no test specified\" && exit 1"
     },
     "dependencies": {
-        "fabric-ca-client": "^1.0.2",
-        "fabric-client": "^1.0.2",
+        "fabric-ca-client": "unstable",
+        "fabric-client": "unstable",
         "grpc": "^1.6.0"
     },
     "author": "Anthony O'Dowd",

diff --git a/fabcar/startFabric.sh b/fabcar/startFabric.sh
@@ -16,6 +16,9 @@ if [ "$LANGUAGE" = "node" -o "$LANGUAGE" = "NODE" ]; then
 	CC_SRC_PATH=/opt/gopath/src/github.com/fabcar/node
 fi
 
+# clean the keystore
+rm -rf ./hfc-key-store
+
 # launch network; create channel and join peer to channel
 cd ../basic-network
 ./start.sh