Merge changes from topic "kill-common-mocks"

* changes: FAB-16437 Remove common/mocks/policies FAB-16437 Remove common/mocks/msp
hyperledger · Nov 12, 2019 · f4c7914 · f4c7914
2 parents cd8c374 + f62a2c0
commit f4c7914
Show file tree

Hide file tree

Showing 21 changed files with 1,659 additions and 364 deletions.
diff --git a/common/ledger/testutil/fakes/signing_identity.go b/common/ledger/testutil/fakes/signing_identity.go
diff --git a/common/ledger/testutil/test_helper.go b/common/ledger/testutil/test_helper.go
@@ -16,7 +16,8 @@ import (
 	"github.com/hyperledger/fabric/bccsp/sw"
 	"github.com/hyperledger/fabric/common/configtx/test"
 	"github.com/hyperledger/fabric/common/crypto"
-	mmsp "github.com/hyperledger/fabric/common/mocks/msp"
+
+	"github.com/hyperledger/fabric/common/ledger/testutil/fakes"
 	lutils "github.com/hyperledger/fabric/core/ledger/util"
 	"github.com/hyperledger/fabric/msp"
 	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
@@ -64,6 +65,12 @@ type BlockDetails struct {
 	Txs          []*TxDetails
 }
 
+//go:generate counterfeiter -o fakes/signing_identity.go --fake-name SigningIdentity . signingIdentity
+
+type signingIdentity interface {
+	msp.SigningIdentity
+}
+
 // NewBlockGenerator instantiates new BlockGenerator for testing
 func NewBlockGenerator(t *testing.T, ledgerID string, signTxs bool) (*BlockGenerator, *common.Block) {
 	gb, err := test.MakeGenesisBlock(ledgerID)
@@ -360,8 +367,8 @@ func ConstructUnsignedTxEnv(
 	visibility []byte,
 	headerType common.HeaderType,
 ) (*common.Envelope, string, error) {
-	mspLcl := mmsp.NewNoopMsp()
-	sigId, _ := mspLcl.GetDefaultSigningIdentity()
+
+	sigId := &fakes.SigningIdentity{}
 
 	return ConstructSignedTxEnv(
 		chainID,

diff --git a/common/mocks/msp/noopmsp.go b/common/mocks/msp/noopmsp.go
diff --git a/common/mocks/msp/noopmsp_test.go b/common/mocks/msp/noopmsp_test.go
diff --git a/common/mocks/policies/policies.go b/common/mocks/policies/policies.go
diff --git a/common/mocks/policies/policies_test.go b/common/mocks/policies/policies_test.go
diff --git a/core/chaincode/chaincode_suite_test.go b/core/chaincode/chaincode_suite_test.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/hyperledger/fabric/common/channelconfig"
 	commonledger "github.com/hyperledger/fabric/common/ledger"
+	"github.com/hyperledger/fabric/common/policies"
 	"github.com/hyperledger/fabric/core/chaincode"
 	"github.com/hyperledger/fabric/core/common/privdata"
 	"github.com/hyperledger/fabric/core/container/ccintf"
@@ -135,3 +136,13 @@ type applicationCapabilities interface {
 type applicationConfig interface {
 	channelconfig.Application
 }
+
+//go:generate counterfeiter -o mock/policy_manager.go -fake-name PolicyManager . policyManager
+type policyManager interface {
+	policies.Manager
+}
+
+//go:generate counterfeiter -o mock/policy.go -fake-name Policy . policy
+type policy interface {
+	policies.Policy
+}
diff --git a/core/chaincode/chaincode_support_test.go b/core/chaincode/chaincode_support_test.go
@@ -270,7 +270,7 @@ func initMockPeer(channelIDs ...string) (*peer.Peer, *ChaincodeSupport, func(),
 
 	globalBlockNum = make(map[string]uint64, len(channelIDs))
 	for _, id := range channelIDs {
-		if err := peer.CreateMockChannel(peerInstance, id); err != nil {
+		if err := peer.CreateMockChannel(peerInstance, id, &mock.PolicyManager{}); err != nil {
 			cleanup()
 			return nil, nil, func() {}, err
 		}