Skip to content

Commit

Permalink
[FAB-7502] remove unused code in msp
Browse files Browse the repository at this point in the history
This change set removes unused code in msp package

Change-Id: I2357bc920b2462f04c9814d1cd87c4da184d8c62
Signed-off-by: yacovm <yacovm@il.ibm.com>
  • Loading branch information
yacovm committed Dec 18, 2017
1 parent 525d214 commit 437a512
Showing 1 changed file with 0 additions and 33 deletions.
33 changes: 0 additions & 33 deletions msp/msp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 437a512

Please sign in to comment.