Merge "[FAB-7502] remove unused code in msp"

hyperledger · Dec 19, 2017 · 4d802d1 · 4d802d1
2 parents 50c93fd + 437a512
commit 4d802d1
Showing 1 changed file with 0 additions and 33 deletions.
diff --git a/msp/msp_test.go b/msp/msp_test.go
@@ -979,21 +979,6 @@ func getIdentity(t *testing.T, path string) Identity {
  return id
 }
 
-func getLocalMSPWithError(t *testing.T, dir string) (MSP, error) {
- conf, err := GetLocalMspConfig(dir, nil, "DEFAULT")
- assert.NoError(t, err)
-
- thisMSP, err := newBccspMsp(MSPv1_0)
- assert.NoError(t, err)
- ks, err := sw.NewFileBasedKeyStore(nil, filepath.Join(dir, "keystore"), true)
- assert.NoError(t, err)
- csp, err := sw.New(256, "SHA2", ks)
- assert.NoError(t, err)
- thisMSP.(*bccspmsp).bccsp = csp
-
- return thisMSP, thisMSP.Setup(conf)
-}
-
 func getLocalMSPWithVersionAndError(t *testing.T, dir string, version MSPVersion) (MSP, error) {
  conf, err := GetLocalMspConfig(dir, nil, "DEFAULT")
  assert.NoError(t, err)
@@ -1045,24 +1030,6 @@ func getLocalMSPWithVersion(t *testing.T, dir string, version MSPVersion) MSP {
  return thisMSP
 }
 
-func getLocalMSPWithName(t *testing.T, name, dir string) MSP {
- conf, err := GetLocalMspConfig(dir, nil, name)
- assert.NoError(t, err)
-
- thisMSP, err := newBccspMsp(MSPv1_0)
- assert.NoError(t, err)
- ks, err := sw.NewFileBasedKeyStore(nil, filepath.Join(dir, "keystore"), true)
- assert.NoError(t, err)
- csp, err := sw.New(256, "SHA2", ks)
- assert.NoError(t, err)
- thisMSP.(*bccspmsp).bccsp = csp
-
- err = thisMSP.Setup(conf)
- assert.NoError(t, err)
-
- return thisMSP
-}
-
 func TestMSPIdentityIdentifier(t *testing.T) {
  // testdata/mspid
  // 1) a key and a signcert (used to populate the default signing identity) with the cert having a HighS signature