FAB-16158 Remove unused interface methods

The ccprovider.ChaincodeDefinition interface needs to go away.  We
should instead have lifecycle return a concrete type.  However, as there
are currently no consumers of the name or hash fields of this interface,
let's remove them to prevent new deps from forming.

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

Author: Jason Yellick

core/chaincode/chaincode_ginkgo_support_test.go

@@ -55,7 +55,6 @@ var _ = Describe("CheckInvocation", func() {
 
 		BeforeEach(func() {
 			chaincodeDefinition = &lifecycle.LegacyDefinition{
-				Name:      "definition-name",
 				Version:   "definition-version",
 				CCIDField: "definition-ccid",
 			}

core/chaincode/chaincode_support_test.go

@@ -183,7 +183,6 @@ func initMockPeer(chainIDs ...string) (*peer.Peer, *ChaincodeSupport, func(), er
 			}, nil
 		case "lscc":
 			return &lifecycle.LegacyDefinition{
-				Name:      "lscc",
 				Version:   "syscc",
 				CCIDField: "lscc.syscc",
 			}, nil

core/chaincode/exectransaction_test.go

@@ -111,7 +111,6 @@ func initPeer(chainIDs ...string) (*cm.Lifecycle, net.Listener, *ChaincodeSuppor
 		switch name {
 		case "lscc":
 			return &lifecycle.LegacyDefinition{
-				Name:      "lscc",
 				Version:   "syscc",
 				CCIDField: "lscc.syscc",
 			}, nil
@@ -619,7 +618,6 @@ func TestChaincodeInvokeChaincode(t *testing.T) {
 		switch name {
 		case "lscc":
 			return &lifecycle.LegacyDefinition{
-				Name:      "lscc",
 				Version:   "syscc",
 				CCIDField: "lscc.syscc",
 			}, nil
@@ -758,7 +756,6 @@ func TestChaincodeInvokeChaincodeErrorCase(t *testing.T) {
 		switch name {
 		case "lscc":
 			return &lifecycle.LegacyDefinition{
-				Name:      "lscc",
 				Version:   "syscc",
 				CCIDField: "lscc.syscc",
 			}, nil

core/chaincode/lifecycle/legacy_lifecycle.go

@@ -7,7 +7,6 @@ SPDX-License-Identifier: Apache-2.0
 package lifecycle
 
 import (
-	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/common/ccprovider"
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/core/scc"
@@ -34,26 +33,12 @@ type ChaincodeInfoCache interface {
 // It is a different data-type to allow differentiation at cast-time from
 // chaincode definitions which require validaiton of instantiation policy.
 type LegacyDefinition struct {
-	Name              string
 	Version           string
 	EndorsementPlugin string
 	RequiresInitField bool
 	CCIDField         string
 }
 
-// CCName returns the chaincode name
-func (ld *LegacyDefinition) CCName() string {
-	return ld.Name
-}
-
-// Hash returns the hash of <name>:<version>.  This is useless, but
-// is a hack to allow the rest of the code to have consistent view of
-// what hash means for a chaincode definition.  Ultimately, this should
-// be removed.
-func (ld *LegacyDefinition) Hash() []byte {
-	return util.ComputeSHA256([]byte(ld.Name + ":" + ld.Version))
-}
-
 // CCVersion returns the version of the chaincode.
 func (ld *LegacyDefinition) CCVersion() string {
 	return ld.Version
@@ -135,7 +120,6 @@ func (cei *ChaincodeEndorsementInfo) CachedChaincodeInfo(channelID, chaincodeNam
 func (cei *ChaincodeEndorsementInfo) ChaincodeDefinition(channelID, chaincodeName string, qe ledger.SimpleQueryExecutor) (ccprovider.ChaincodeDefinition, error) {
 	if cei.BuiltinSCCs.IsSysCC(chaincodeName) {
 		return &LegacyDefinition{
-			Name:              chaincodeName,
 			Version:           scc.SysCCVersion,
 			EndorsementPlugin: "escc",
 			RequiresInitField: false,
@@ -154,7 +138,6 @@ func (cei *ChaincodeEndorsementInfo) ChaincodeDefinition(channelID, chaincodeNam
 	chaincodeDefinition := chaincodeInfo.Definition
 
 	return &LegacyDefinition{
-		Name:              chaincodeName,
 		Version:           chaincodeDefinition.EndorsementInfo.Version,
 		EndorsementPlugin: chaincodeDefinition.EndorsementInfo.EndorsementPlugin,
 		RequiresInitField: chaincodeDefinition.EndorsementInfo.InitRequired,

core/chaincode/lifecycle/legacy_lifecycle_test.go

@@ -9,7 +9,6 @@ package lifecycle_test
 import (
 	"fmt"
 
-	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/chaincode/lifecycle"
 	"github.com/hyperledger/fabric/core/chaincode/lifecycle/mock"
 	"github.com/hyperledger/fabric/core/common/ccprovider"
@@ -186,7 +185,6 @@ var _ = Describe("ChaincodeEndorsementInfo", func() {
 			def, err := cei.ChaincodeDefinition("channel-id", "name", fakeQueryExecutor)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(def).To(Equal(&lifecycle.LegacyDefinition{
-				Name:              "name",
 				Version:           "version",
 				EndorsementPlugin: "endorsement-plugin",
 				CCIDField:         "hash",
@@ -202,7 +200,6 @@ var _ = Describe("ChaincodeEndorsementInfo", func() {
 				res, err := cei.ChaincodeDefinition("channel-id", "test-syscc-name", fakeQueryExecutor)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(res).To(Equal(&lifecycle.LegacyDefinition{
-					Name:              "test-syscc-name",
 					Version:           "syscc",
 					EndorsementPlugin: "escc",
 					CCIDField:         "test-syscc-name.syscc",
@@ -229,7 +226,6 @@ var _ = Describe("ChaincodeEndorsementInfo", func() {
 			BeforeEach(func() {
 				delete(fakePublicState, "namespaces/fields/name/Sequence")
 				legacyChaincodeDefinition = &ccprovider.ChaincodeData{
-					Name:    "definition-name",
 					Version: "definition-version",
 				}
 
@@ -257,31 +253,18 @@ var _ = Describe("LegacyDefinition", func() {
 
 	BeforeEach(func() {
 		ld = &lifecycle.LegacyDefinition{
-			Name:              "name",
 			Version:           "version",
 			EndorsementPlugin: "endorsement-plugin",
 			RequiresInitField: true,
 		}
 	})
 
-	Describe("CCName", func() {
-		It("returns the name", func() {
-			Expect(ld.CCName()).To(Equal("name"))
-		})
-	})
-
 	Describe("CCVersion", func() {
 		It("returns the version", func() {
 			Expect(ld.CCVersion()).To(Equal("version"))
 		})
 	})
 
-	Describe("Hash", func() {
-		It("returns the sha256 hash of name and version", func() {
-			Expect(ld.Hash()).To(Equal(util.ComputeSHA256([]byte("name:version"))))
-		})
-	})
-
 	Describe("Endorsement", func() {
 		It("returns the endorsment plugin name", func() {
 			Expect(ld.Endorsement()).To(Equal("endorsement-plugin"))

core/common/ccprovider/ccprovider.go

@@ -360,12 +360,6 @@ func GetInstalledChaincodes() (*pb.ChaincodeQueryResponse, error) {
 // ChaincodeDefinition describes all of the necessary information for a peer to decide whether to endorse
 // a proposal and whether to validate a transaction, for a particular chaincode.
 type ChaincodeDefinition interface {
-	// CCName returns the name of this chaincode (the name it was put in the ChaincodeRegistry with).
-	CCName() string
-
-	// Hash returns the hash of the chaincode.
-	Hash() []byte
-
 	// CCVersion returns the version of the chaincode.
 	CCVersion() string
 

core/common/ccprovider/ccprovider_test.go

@@ -118,10 +118,8 @@ func TestChaincodeData(t *testing.T) {
 		Vscc:                "Vscc",
 	}
 
-	assert.Equal(t, cd.CCName(), "Name")
 	assert.Equal(t, cd.CCVersion(), "Version")
 	assert.Equal(t, cd.Endorsement(), "Escc")
-	assert.Equal(t, cd.Hash(), []byte("Id"))
 	assert.Equal(t, cd.RequiresInit(), false)
 }