[FAB-6891] use mocks to test the endorser

This change set uses a mock support for the endorsement in testing instead of
using the real implementation. This way, the endorser may be tested without
any dependency on other packages/components.

Change-Id: Ic3eee5908f221be8bedcb2b643dcba6800ab62aa
Signed-off-by: Alessandro Sorniotti <ale.linux@sopit.net>

Author: ale-linux

common/mocks/resourcesconfig/resourcesconfig.go

@@ -0,0 +1,36 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package resourceconfig
+
+type MockChaincodeDefinition struct {
+	NameRv          string
+	VersionRv       string
+	EndorsementStr  string
+	ValidationStr   string
+	ValidationBytes []byte
+	HashRv          []byte
+}
+
+func (m *MockChaincodeDefinition) CCName() string {
+	return m.NameRv
+}
+
+func (m *MockChaincodeDefinition) Hash() []byte {
+	return m.HashRv
+}
+
+func (m *MockChaincodeDefinition) CCVersion() string {
+	return m.VersionRv
+}
+
+func (m *MockChaincodeDefinition) Validation() (string, []byte) {
+	return m.ValidationStr, m.ValidationBytes
+}
+
+func (m *MockChaincodeDefinition) Endorsement() string {
+	return m.EndorsementStr
+}

core/endorser/endorser.go

@@ -9,16 +9,13 @@ package endorser
 import (
 	"fmt"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/common/resourcesconfig"
 	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/chaincode"
 	"github.com/hyperledger/fabric/core/chaincode/shim"
 	"github.com/hyperledger/fabric/core/common/validation"
 	"github.com/hyperledger/fabric/core/ledger"
-	"github.com/hyperledger/fabric/core/peer"
-	"github.com/hyperledger/fabric/msp"
 	"github.com/hyperledger/fabric/protos/common"
 	"github.com/hyperledger/fabric/protos/ledger/rwset"
 	pb "github.com/hyperledger/fabric/protos/peer"
@@ -513,33 +510,3 @@ func (e *Endorser) ProcessProposal(ctx context.Context, signedProp *pb.SignedPro
 
 	return pResp, nil
 }
-
-// Only exposed for testing purposes - commit the tx simulation so that
-// a deploy transaction is persisted and that chaincode can be invoked.
-// This makes the endorser test self-sufficient
-func (e *Endorser) commitTxSimulation(proposal *pb.Proposal, chainID string, signer msp.SigningIdentity, pResp *pb.ProposalResponse, blockNumber uint64) error {
-	tx, err := putils.CreateSignedTx(proposal, signer, pResp)
-	if err != nil {
-		return err
-	}
-
-	lgr := peer.GetLedger(chainID)
-	if lgr == nil {
-		return errors.Errorf("failed to look up the ledger for channel %s", chainID)
-	}
-
-	txBytes, err := proto.Marshal(tx)
-	if err != nil {
-		return err
-	}
-	block := common.NewBlock(blockNumber, []byte{})
-	block.Data.Data = [][]byte{txBytes}
-	block.Header.DataHash = block.Data.Hash()
-	if err = lgr.CommitWithPvtData(&ledger.BlockAndPvtData{
-		Block: block,
-	}); err != nil {
-		return err
-	}
-
-	return nil
-}