FAB-16124 Kill IsSyccNotInvokableExternal

This is yet another case of superfluous API bloat.  It's entirely
possible for a chaincode to check itself whether it's being invoked
'externally' or via 'cc2cc', so, there's no need for Fabric to provide
this as part of the sccprovider.

Change-Id: If08d4605c26fe0bf7ebeb8372579882cafd9f40c
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>

Author: Jason Yellick

core/common/sysccprovider/sysccprovider.go

@@ -30,10 +30,6 @@ type SystemChaincodeProvider interface {
 	// IsSysCC returns true if the supplied chaincode is a system chaincode
 	IsSysCC(name string) bool
 
-	// IsSysCCAndNotInvokable returns true if the supplied chaincode
-	// is a system chaincode and is not invokable through a proposal
-	IsSysCCAndNotInvokableExternal(name string) bool
-
 	// GetQueryExecutorForLedger returns a query executor for the
 	// ledger of the supplied channel.
 	// That's useful for system chaincodes that require unfettered

core/endorser/endorser.go

@@ -40,10 +40,6 @@ type privateDataDistributor func(channel string, txID string, privateData *trans
 // Support contains functions that the endorser requires to execute its tasks
 type Support interface {
 	identity.SignerSerializer
-	// IsSysCCAndNotInvokableExternal returns true if the supplied chaincode is
-	// ia system chaincode and it NOT invokable
-	IsSysCCAndNotInvokableExternal(name string) bool
-
 	// GetTxSimulator returns the transaction simulator for the specified ledger
 	// a client may obtain more than one such simulator; they are made unique
 	// by way of the supplied txid
@@ -370,14 +366,6 @@ func (e *Endorser) preProcess(signedProp *pb.SignedProposal) (*validateResult, e
 		return vr, err
 	}
 
-	// block invocations to security-sensitive system chaincodes
-	if e.s.IsSysCCAndNotInvokableExternal(hdrExt.ChaincodeId.Name) {
-		endorserLogger.Errorf("Error: an attempt was made by %#v to invoke system chaincode %s", shdr.Creator, hdrExt.ChaincodeId.Name)
-		err = errors.Errorf("chaincode %s cannot be invoked through a proposal", hdrExt.ChaincodeId.Name)
-		vr.resp = &pb.ProposalResponse{Response: &pb.Response{Status: 500, Message: err.Error()}}
-		return vr, err
-	}
-
 	chainID := chdr.ChannelId
 	txid := chdr.TxId
 	endorserLogger.Debugf("[%s][%s] processing txid: %s", chainID, shorttxid(txid), txid)

core/endorser/endorser_test.go

@@ -158,22 +158,6 @@ func TestEndorserNilProp(t *testing.T) {
 	assert.EqualValues(t, 1, fakeMetrics.proposalValidationFailed.AddArgsForCall(0))
 }
 
-func TestEndorserUninvokableSysCC(t *testing.T) {
-	es := endorser.NewEndorserServer(pvtEmptyDistributor, &mocks.MockSupport{
-		GetApplicationConfigBoolRv:       true,
-		GetApplicationConfigRv:           &mc.MockApplication{CapabilitiesRv: &mc.MockApplicationCapabilities{}},
-		GetTransactionByIDErr:            errors.New(""),
-		IsSysCCAndNotInvokableExternalRv: true,
-	}, packaging.NewRegistry(&golang.Platform{}), &disabled.Provider{})
-
-	signedProp := getSignedProp("test-chaincode", "test-version", t)
-
-	pResp, err := es.ProcessProposal(context.Background(), signedProp)
-	assert.Error(t, err)
-	assert.EqualValues(t, 500, pResp.Response.Status)
-	assert.Equal(t, "chaincode test-chaincode cannot be invoked through a proposal", pResp.Response.Message)
-}
-
 func TestEndorserCCInvocationFailed(t *testing.T) {
 	es := endorser.NewEndorserServer(pvtEmptyDistributor, &mocks.MockSupport{
 		GetApplicationConfigBoolRv: true,

core/endorser/mocks/support.go

@@ -55,12 +55,6 @@ func (s *SupportImpl) SigningIdentityForRequest(*pb.SignedProposal) (SigningIden
 	return s.SignerSerializer, nil
 }
 
-// IsSysCCAndNotInvokableExternal returns true if the supplied chaincode is
-// ia system chaincode and it NOT invokable
-func (s *SupportImpl) IsSysCCAndNotInvokableExternal(name string) bool {
-	return s.SysCCProvider.IsSysCCAndNotInvokableExternal(name)
-}
-
 // GetTxSimulator returns the transaction simulator for the specified ledger
 // a client may obtain more than one such simulator; they are made unique
 // by way of the supplied txid

core/endorser/support.go

@@ -88,11 +88,6 @@ func TestIsSysCC(t *testing.T) {
 	assert.True(t, (newTestProvider()).IsSysCC("disabled"))
 }
 
-func TestIsSysCCAndNotInvokableExternal(t *testing.T) {
-	assert.False(t, (newTestProvider()).IsSysCCAndNotInvokableExternal("invokableExternalButNotCC2CC"))
-	assert.True(t, (newTestProvider()).IsSysCCAndNotInvokableExternal("invokableCC2CCButNotExternal"))
-}
-
 func TestSccProviderImpl_GetQueryExecutorForLedger(t *testing.T) {
 	p := &scc.Provider{
 		Peer: &peer.Peer{},

core/scc/lscc/mock/sysccprovider.go

@@ -57,23 +57,6 @@ func (p *Provider) GetQueryExecutorForLedger(cid string) (ledger.QueryExecutor,
 	return l.NewQueryExecutor()
 }
 
-// IsSysCCAndNotInvokableExternal returns true if the chaincode
-// is a system chaincode and *CANNOT* be invoked through
-// a proposal to this peer
-func (p *Provider) IsSysCCAndNotInvokableExternal(name string) bool {
-	for _, sysCC := range p.SysCCs {
-		if sysCC.Name() == name {
-			return !sysCC.InvokableExternal()
-		}
-	}
-
-	if isDeprecatedSysCC(name) {
-		return true
-	}
-
-	return false
-}
-
 // GetApplicationConfig returns the configtxapplication.SharedConfig for the channel
 // and whether the Application config exists
 func (p *Provider) GetApplicationConfig(cid string) (channelconfig.Application, bool) {