[FAB-2651] Single path to unit-testing keystore

https://jira.hyperledger.org/browse/FAB-2651

This patch updates the relative path to the keystore
used by unit tests. A common location
is now used for all unit tests. See JIRA for
reasons this patch was created.

Change-Id: I45db19e0f0bbf69c1a93d84fd6e9b5ba4e3b892c
Signed-off-by: John Harrison <[email protected]>

Author: John Harrison

core/config/config.go

@@ -19,6 +19,7 @@ package config
 import (
 	"flag"
 	"fmt"
+	"io/ioutil"
 	"runtime"
 	"strings"
 
@@ -84,7 +85,12 @@ func SetupTestConfig(pathToOpenchainYaml string) {
 		bccspConfig = nil
 	}
 
-	msp.SetupBCCSPKeystoreConfig(bccspConfig, viper.GetString("peer.mspConfigPath")+"/keystore")
+	tmpKeyStore, err := ioutil.TempDir("/tmp", "msp-keystore")
+	if err != nil {
+		panic(fmt.Errorf("Could not create temporary directory: %s\n", tmpKeyStore))
+	}
+
+	msp.SetupBCCSPKeystoreConfig(bccspConfig, tmpKeyStore)
 
 	err = factory.InitFactories(bccspConfig)
 	if err != nil {

events/config.go

@@ -19,6 +19,7 @@ package events
 import (
 	"flag"
 	"fmt"
+	"io/ioutil"
 	"runtime"
 	"strings"
 
@@ -75,7 +76,12 @@ func SetupTestConfig() {
 		bccspConfig = nil
 	}
 
-	msp.SetupBCCSPKeystoreConfig(bccspConfig, viper.GetString("peer.mspConfigPath")+"/keystore")
+	tmpKeyStore, err := ioutil.TempDir("/tmp", "msp-keystore")
+	if err != nil {
+		panic(fmt.Errorf("Could not create temporary directory: %s\n", tmpKeyStore))
+	}
+
+	msp.SetupBCCSPKeystoreConfig(bccspConfig, tmpKeyStore)
 
 	err = factory.InitFactories(bccspConfig)
 	if err != nil {