From 437a512bf34b6677da1407b10058a03daf6a5245 Mon Sep 17 00:00:00 2001 From: yacovm Date: Tue, 19 Dec 2017 01:14:08 +0200 Subject: [PATCH] [FAB-7502] remove unused code in msp This change set removes unused code in msp package Change-Id: I2357bc920b2462f04c9814d1cd87c4da184d8c62 Signed-off-by: yacovm --- msp/msp_test.go | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/msp/msp_test.go b/msp/msp_test.go index 835f65f792a..fff9f3c8223 100644 --- 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