msp/mgmt: remove GetLocalSigningIdentityOrPanic

Signed-off-by: Matthew Sykes <[email protected]>

core/peer/peer_test.go

@@ -56,7 +56,8 @@ func NewTestPeer(t *testing.T) (*Peer, func()) {
 	// Initialize gossip service
 	cryptoProvider, err := sw.NewDefaultSecurityLevelWithKeystore(sw.NewDummyKeyStore())
 	require.NoError(t, err)
-	signer := mgmt.GetLocalSigningIdentityOrPanic(cryptoProvider)
+	signer, err := mgmt.GetLocalMSP(cryptoProvider).GetDefaultSigningIdentity()
+	require.NoError(t, err)
 
 	localMSP := mgmt.GetLocalMSP(cryptoProvider)
 	deserManager := peergossip.NewDeserializersManager(localMSP)

core/scc/cscc/configure_test.go

@@ -572,8 +572,9 @@ func newPeerConfiger(t *testing.T, ledgerMgr *ledgermgmt.LedgerMgr, grpcServer *
 	cryptoProvider, err := sw.NewDefaultSecurityLevelWithKeystore(sw.NewDummyKeyStore())
 	require.NoError(t, err)
 
-	signer := mgmt.GetLocalSigningIdentityOrPanic(cryptoProvider)
 	localMSP := mgmt.GetLocalMSP(cryptoProvider)
+	signer, err := localMSP.GetDefaultSigningIdentity()
+	require.NoError(t, err)
 	deserManager := peergossip.NewDeserializersManager(localMSP)
 
 	messageCryptoService := peergossip.NewMCS(

gossip/privdata/coordinator_test.go

@@ -576,7 +576,8 @@ var expectedCommittedPrivateData3 = map[uint64]*ledger.TxPvtData{}
 func TestCoordinatorStoreInvalidBlock(t *testing.T) {
 	err := msptesttools.LoadMSPSetupForTesting()
 	require.NoError(t, err, fmt.Sprintf("Failed to setup local msp for testing, got err %s", err))
-	identity := mspmgmt.GetLocalSigningIdentityOrPanic(factory.GetDefault())
+	identity, err := mspmgmt.GetLocalMSP(factory.GetDefault()).GetDefaultSigningIdentity()
+	require.NoError(t, err)
 	serializedID, err := identity.Serialize()
 	require.NoError(t, err, fmt.Sprintf("Serialize should have succeeded, got err %s", err))
 	data := []byte{1, 2, 3}
@@ -885,7 +886,8 @@ func TestCoordinatorToFilterOutPvtRWSetsWithWrongHash(t *testing.T) {
 	*/
 	err := msptesttools.LoadMSPSetupForTesting()
 	require.NoError(t, err, fmt.Sprintf("Failed to setup local msp for testing, got err %s", err))
-	identity := mspmgmt.GetLocalSigningIdentityOrPanic(factory.GetDefault())
+	identity, err := mspmgmt.GetLocalMSP(factory.GetDefault()).GetDefaultSigningIdentity()
+	require.NoError(t, err)
 	serializedID, err := identity.Serialize()
 	require.NoError(t, err, fmt.Sprintf("Serialize should have succeeded, got err %s", err))
 	data := []byte{1, 2, 3}
@@ -1011,7 +1013,8 @@ func TestCoordinatorToFilterOutPvtRWSetsWithWrongHash(t *testing.T) {
 func TestCoordinatorStoreBlock(t *testing.T) {
 	err := msptesttools.LoadMSPSetupForTesting()
 	require.NoError(t, err, fmt.Sprintf("Failed to setup local msp for testing, got err %s", err))
-	identity := mspmgmt.GetLocalSigningIdentityOrPanic(factory.GetDefault())
+	identity, err := mspmgmt.GetLocalMSP(factory.GetDefault()).GetDefaultSigningIdentity()
+	require.NoError(t, err)
 	serializedID, err := identity.Serialize()
 	require.NoError(t, err, fmt.Sprintf("Serialize should have succeeded, got err %s", err))
 	data := []byte{1, 2, 3}
@@ -1311,7 +1314,8 @@ func TestCoordinatorStoreBlock(t *testing.T) {
 func TestCoordinatorStoreBlockWhenPvtDataExistInLedger(t *testing.T) {
 	err := msptesttools.LoadMSPSetupForTesting()
 	require.NoError(t, err, fmt.Sprintf("Failed to setup local msp for testing, got err %s", err))
-	identity := mspmgmt.GetLocalSigningIdentityOrPanic(factory.GetDefault())
+	identity, err := mspmgmt.GetLocalMSP(factory.GetDefault()).GetDefaultSigningIdentity()
+	require.NoError(t, err)
 	serializedID, err := identity.Serialize()
 	require.NoError(t, err, fmt.Sprintf("Serialize should have succeeded, got err %s", err))
 	data := []byte{1, 2, 3}
@@ -1385,7 +1389,8 @@ func TestProceedWithoutPrivateData(t *testing.T) {
 	// Block needs to be committed with missing private data.
 	err := msptesttools.LoadMSPSetupForTesting()
 	require.NoError(t, err, fmt.Sprintf("Failed to setup local msp for testing, got err %s", err))
-	identity := mspmgmt.GetLocalSigningIdentityOrPanic(factory.GetDefault())
+	identity, err := mspmgmt.GetLocalMSP(factory.GetDefault()).GetDefaultSigningIdentity()
+	require.NoError(t, err)
 	serializedID, err := identity.Serialize()
 	require.NoError(t, err, fmt.Sprintf("Serialize should have succeeded, got err %s", err))
 	data := []byte{1, 2, 3}
@@ -1501,7 +1506,8 @@ func TestProceedWithInEligiblePrivateData(t *testing.T) {
 	// Block needs to be committed with missing private data.
 	err := msptesttools.LoadMSPSetupForTesting()
 	require.NoError(t, err, fmt.Sprintf("Failed to setup local msp for testing, got err %s", err))
-	identity := mspmgmt.GetLocalSigningIdentityOrPanic(factory.GetDefault())
+	identity, err := mspmgmt.GetLocalMSP(factory.GetDefault()).GetDefaultSigningIdentity()
+	require.NoError(t, err)
 	serializedID, err := identity.Serialize()
 	require.NoError(t, err, fmt.Sprintf("Serialize should have succeeded, got err %s", err))
 	data := []byte{1, 2, 3}
@@ -1573,7 +1579,8 @@ func TestCoordinatorGetBlocks(t *testing.T) {
 	metrics := metrics.NewGossipMetrics(&disabled.Provider{}).PrivdataMetrics
 	err := msptesttools.LoadMSPSetupForTesting()
 	require.NoError(t, err, fmt.Sprintf("Failed to setup local msp for testing, got err %s", err))
-	identity := mspmgmt.GetLocalSigningIdentityOrPanic(factory.GetDefault())
+	identity, err := mspmgmt.GetLocalMSP(factory.GetDefault()).GetDefaultSigningIdentity()
+	require.NoError(t, err)
 	serializedID, err := identity.Serialize()
 	require.NoError(t, err, fmt.Sprintf("Serialize should have succeeded, got err %s", err))
 	data := []byte{1, 2, 3}
@@ -1819,7 +1826,8 @@ func TestIgnoreReadOnlyColRWSets(t *testing.T) {
 	// no missing private data was found.
 	err := msptesttools.LoadMSPSetupForTesting()
 	require.NoError(t, err, fmt.Sprintf("Failed to setup local msp for testing, got err %s", err))
-	identity := mspmgmt.GetLocalSigningIdentityOrPanic(factory.GetDefault())
+	identity, err := mspmgmt.GetLocalMSP(factory.GetDefault()).GetDefaultSigningIdentity()
+	require.NoError(t, err)
 	serializedID, err := identity.Serialize()
 	require.NoError(t, err, fmt.Sprintf("Serialize should have succeeded, got err %s", err))
 	data := []byte{1, 2, 3}
@@ -1891,7 +1899,8 @@ func TestIgnoreReadOnlyColRWSets(t *testing.T) {
 func TestCoordinatorMetrics(t *testing.T) {
 	err := msptesttools.LoadMSPSetupForTesting()
 	require.NoError(t, err, fmt.Sprintf("Failed to setup local msp for testing, got err %s", err))
-	identity := mspmgmt.GetLocalSigningIdentityOrPanic(factory.GetDefault())
+	identity, err := mspmgmt.GetLocalMSP(factory.GetDefault()).GetDefaultSigningIdentity()
+	require.NoError(t, err)
 	serializedID, err := identity.Serialize()
 	require.NoError(t, err, fmt.Sprintf("Serialize should have succeeded, got err %s", err))
 	data := []byte{1, 2, 3}

gossip/privdata/pvtdataprovider_test.go

@@ -61,7 +61,8 @@ func TestRetrievePvtdata(t *testing.T) {
 	err := msptesttools.LoadMSPSetupForTesting()
 	require.NoError(t, err, fmt.Sprintf("Failed to setup local msp for testing, got err %s", err))
 
-	identity := mspmgmt.GetLocalSigningIdentityOrPanic(factory.GetDefault())
+	identity, err := mspmgmt.GetLocalMSP(factory.GetDefault()).GetDefaultSigningIdentity()
+	require.NoError(t, err)
 	serializedID, err := identity.Serialize()
 	require.NoError(t, err, fmt.Sprintf("Serialize should have succeeded, got err %s", err))
 	data := []byte{1, 2, 3}
@@ -833,7 +834,8 @@ func TestRetrievePvtdataFailure(t *testing.T) {
 	err := msptesttools.LoadMSPSetupForTesting()
 	require.NoError(t, err, fmt.Sprintf("Failed to setup local msp for testing, got err %s", err))
 
-	identity := mspmgmt.GetLocalSigningIdentityOrPanic(factory.GetDefault())
+	identity, err := mspmgmt.GetLocalMSP(factory.GetDefault()).GetDefaultSigningIdentity()
+	require.NoError(t, err)
 	serializedID, err := identity.Serialize()
 	require.NoError(t, err, fmt.Sprintf("Serialize should have succeeded, got err %s", err))
 	data := []byte{1, 2, 3}
@@ -892,7 +894,8 @@ func TestRetryFetchFromPeer(t *testing.T) {
 	err := msptesttools.LoadMSPSetupForTesting()
 	require.NoError(t, err, fmt.Sprintf("Failed to setup local msp for testing, got err %s", err))
 
-	identity := mspmgmt.GetLocalSigningIdentityOrPanic(factory.GetDefault())
+	identity, err := mspmgmt.GetLocalMSP(factory.GetDefault()).GetDefaultSigningIdentity()
+	require.NoError(t, err)
 	serializedID, err := identity.Serialize()
 	require.NoError(t, err, fmt.Sprintf("Serialize should have succeeded, got err %s", err))
 	data := []byte{1, 2, 3}
@@ -986,7 +989,8 @@ func TestSkipPullingAllInvalidTransactions(t *testing.T) {
 	err := msptesttools.LoadMSPSetupForTesting()
 	require.NoError(t, err, fmt.Sprintf("Failed to setup local msp for testing, got err %s", err))
 
-	identity := mspmgmt.GetLocalSigningIdentityOrPanic(factory.GetDefault())
+	identity, err := mspmgmt.GetLocalMSP(factory.GetDefault()).GetDefaultSigningIdentity()
+	require.NoError(t, err)
 	serializedID, err := identity.Serialize()
 	require.NoError(t, err, fmt.Sprintf("Serialize should have succeeded, got err %s", err))
 	data := []byte{1, 2, 3}
@@ -1087,7 +1091,8 @@ func TestRetrievedPvtdataPurgeBelowHeight(t *testing.T) {
 	err := msptesttools.LoadMSPSetupForTesting()
 	require.NoError(t, err, fmt.Sprintf("Failed to setup local msp for testing, got err %s", err))
 
-	identity := mspmgmt.GetLocalSigningIdentityOrPanic(factory.GetDefault())
+	identity, err := mspmgmt.GetLocalMSP(factory.GetDefault()).GetDefaultSigningIdentity()
+	require.NoError(t, err)
 	serializedID, err := identity.Serialize()
 	require.NoError(t, err, fmt.Sprintf("Serialize should have succeeded, got err %s", err))
 	data := []byte{1, 2, 3}

gossip/service/gossip_service_test.go

@@ -112,10 +112,11 @@ func TestInitGossipService(t *testing.T) {
 
 	err = msptesttools.LoadMSPSetupForTesting()
 	require.NoError(t, err)
-	signer := mgmt.GetLocalSigningIdentityOrPanic(cryptoProvider)
 
 	localMSP := mgmt.GetLocalMSP(cryptoProvider)
 	deserManager := peergossip.NewDeserializersManager(localMSP)
+	signer, err := localMSP.GetDefaultSigningIdentity()
+	require.NoError(t, err)
 
 	messageCryptoService := peergossip.NewMCS(
 		&mocks.ChannelPolicyManagerGetter{},

msp/mgmt/mgmt.go

@@ -187,13 +187,3 @@ func GetIdentityDeserializer(chainID string, cryptoProvider bccsp.BCCSP) msp.Ide
 
 	return GetManagerForChain(chainID)
 }
-
-// GetLocalSigningIdentityOrPanic returns the local signing identity or panic in case
-// or error
-func GetLocalSigningIdentityOrPanic(cryptoProvider bccsp.BCCSP) msp.SigningIdentity {
-	id, err := GetLocalMSP(cryptoProvider).GetDefaultSigningIdentity()
-	if err != nil {
-		mspLogger.Panicf("Failed getting local signing identity [%+v]", err)
-	}
-	return id
-}

msp/mgmt/mgmt_test.go

@@ -55,14 +55,6 @@ func TestGetIdentityDeserializer(t *testing.T) {
 	require.NotNil(t, ids)
 }
 
-func TestGetLocalSigningIdentityOrPanic(t *testing.T) {
-	cryptoProvider, err := sw.NewDefaultSecurityLevelWithKeystore(sw.NewDummyKeyStore())
-	require.NoError(t, err)
-
-	sid := GetLocalSigningIdentityOrPanic(cryptoProvider)
-	require.NotNil(t, sid)
-}
-
 func TestUpdateLocalMspCache(t *testing.T) {
 	// reset localMsp to force it to be initialized on the first call
 	localMsp = nil
@@ -90,17 +82,15 @@ func TestNewMSPMgmtMgr(t *testing.T) {
 	cryptoProvider, err := LoadMSPSetupForTesting()
 	require.Nil(t, err)
 
-	// test for nonexistent channel
-	mspMgmtMgr := GetManagerForChain("fake")
-
-	id := GetLocalSigningIdentityOrPanic(cryptoProvider)
+	id, err := GetLocalMSP(cryptoProvider).GetDefaultSigningIdentity()
+	require.NoError(t, err)
 	require.NotNil(t, id)
 
 	serializedID, err := id.Serialize()
-	if err != nil {
-		t.Fatalf("Serialize should have succeeded, got err %s", err)
-		return
-	}
+	require.NoError(t, err)
+
+	// test for nonexistent channel
+	mspMgmtMgr := GetManagerForChain("fake")
 
 	idBack, err := mspMgmtMgr.DeserializeIdentity(serializedID)
 	require.Error(t, err)
@@ -110,15 +100,6 @@ func TestNewMSPMgmtMgr(t *testing.T) {
 	// test for existing channel
 	mspMgmtMgr = GetManagerForChain("testchannelid")
 
-	id = GetLocalSigningIdentityOrPanic(cryptoProvider)
-	require.NotNil(t, id)
-
-	serializedID, err = id.Serialize()
-	if err != nil {
-		t.Fatalf("Serialize should have succeeded, got err %s", err)
-		return
-	}
-
 	idBack, err = mspMgmtMgr.DeserializeIdentity(serializedID)
 	require.NoError(t, err)
 	require.NotNil(t, idBack, "deserialized identity should not have been nil")