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

hyperledger · Mar 26, 2017 · 397f5de · 397f5de
2 parents 582a5ec + 8a5a5bc
commit 397f5de
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/core/config/config.go b/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 {

diff --git a/events/config.go b/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 {