[FAB-15193] Rewrite mocks discovery

Change-Id: I29ddb8bfa79ba0523ab302f232970b3f736a4fcb
Signed-off-by: rickr <cr22rc@gmail.com>

Author: cr22rc

discovery/support/mocks/policy_manager.go

@@ -7,6 +7,7 @@ SPDX-License-Identifier: Apache-2.0
 package support
 
 import (
+	"github.com/hyperledger/fabric/common/policies"
 	"github.com/hyperledger/fabric/discovery"
 	"github.com/hyperledger/fabric/discovery/support/acl"
 )
@@ -25,6 +26,12 @@ type ChannelPolicyManagerGetter interface {
 	acl.ChannelPolicyManagerGetter
 }
 
+//go:generate mockery -dir . -name PolicyManager -case underscore  -output mocks/
+
+type PolicyManager interface {
+	policies.Manager
+}
+
 // DiscoverySupport aggregates all the support needed for the discovery service
 type DiscoverySupport struct {
 	discovery.AccessControlSupport

discovery/support/support.go

@@ -28,7 +28,6 @@ import (
 	"github.com/hyperledger/fabric/common/cauthdsl"
 	"github.com/hyperledger/fabric/common/configtx"
 	"github.com/hyperledger/fabric/common/crypto/tlsgen"
-	policiesmocks "github.com/hyperledger/fabric/common/mocks/policies"
 	"github.com/hyperledger/fabric/common/policies"
 	"github.com/hyperledger/fabric/common/util"
 	cc "github.com/hyperledger/fabric/core/cclifecycle"
@@ -577,13 +576,10 @@ func createPolicyManagerGetter(t *testing.T, mspMgr msp.MSPManager) *mocks.Chann
 	assert.NoError(t, err)
 	org1Org2MembersPolicy, _, err := cauthdsl.NewPolicyProvider(mspMgr).NewPolicy(protoutil.MarshalOrPanic(org1Org2Members))
 	assert.NoError(t, err)
-	_ = org1Org2MembersPolicy
+
 	polMgr := &mocks.ChannelPolicyManagerGetter{}
-	policyMgr := &policiesmocks.Manager{
-		PolicyMap: map[string]policies.Policy{
-			policies.ChannelApplicationWriters: org1Org2MembersPolicy,
-		},
-	}
+	policyMgr := &mocks.PolicyManager{}
+	policyMgr.On("GetPolicy", policies.ChannelApplicationWriters).Return(org1Org2MembersPolicy, true)
 	polMgr.On("Manager", "mychannel").Return(policyMgr, false)
 	return polMgr
 }