[FAB-5715] Rm policies.Manager unused interfaces

There are some methods in the policies.Manager interface which are not
used outside of the policies package.  This makes other implementations
and mocks of this interface more difficult to do, and generally goes
against the go best practice of defining small interfaces.

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

Author: Jason Yellick

common/configtx/update_test.go

@@ -142,12 +142,10 @@ func TestPolicyForItem(t *testing.T) {
 	cm := &configManager{
 		initializer: &mockconfigtx.Initializer{
 			PolicyManagerVal: &mockpolicies.Manager{
-				BasePathVal: "root",
-				Policy:      rootPolicy,
+				Policy: rootPolicy,
 				SubManagersMap: map[string]*mockpolicies.Manager{
 					"foo": &mockpolicies.Manager{
-						Policy:      fooPolicy,
-						BasePathVal: "foo",
+						Policy: fooPolicy,
 					},
 				},
 			},

common/mocks/policies/policies.go

@@ -38,26 +38,13 @@ type Manager struct {
 	// for id is not in PolicyMap
 	Policy *Policy
 
-	// BasePathVal is returned as the result of BasePath
-	BasePathVal string
-
 	// PolicyMap is returned is used to look up Policies in
 	PolicyMap map[string]policies.Policy
 
 	// SubManagers is used for the return value of Manager
 	SubManagersMap map[string]*Manager
 }
 
-// PolicyNames panics
-func (m *Manager) PolicyNames() []string {
-	panic("Unimplemented")
-}
-
-// BasePath returns BasePathVal
-func (m *Manager) BasePath() string {
-	return m.BasePathVal
-}
-
 // Manager returns the Manager from SubManagers for the last component of the path
 func (m *Manager) Manager(path []string) (policies.Manager, bool) {
 	if len(path) == 0 {

common/policies/policy.go

@@ -75,12 +75,6 @@ type Manager interface {
 
 	// Manager returns the sub-policy manager for a given path and whether it exists
 	Manager(path []string) (Manager, bool)
-
-	// Basepath returns the basePath the manager was instantiated with
-	BasePath() string
-
-	// Policies returns all policy names defined in the manager
-	PolicyNames() []string
 }
 
 // Proposer is the interface used by the configtx manager for policy management

common/policies/policy_test.go

@@ -148,11 +148,11 @@ func TestNestedManager(t *testing.T) {
 		_, ok := n1.GetPolicy(policyName)
 		assert.True(t, ok, "Should have found policy %s", policyName)
 
-		_, ok = m.GetPolicy(n1.BasePath() + "/" + policyName)
+		_, ok = m.GetPolicy(n1.(*ManagerImpl).BasePath() + "/" + policyName)
 		assert.True(t, ok, "Should have found policy %s", policyName)
 
 		for i, abs := range []Manager{n1, m} {
-			absName := absPrefix + n1.BasePath() + "/" + policyName
+			absName := absPrefix + n1.(*ManagerImpl).BasePath() + "/" + policyName
 			_, ok = abs.GetPolicy(absName)
 			assert.True(t, ok, "Should have found absolutely policy for manager %d", i)
 		}
@@ -162,14 +162,14 @@ func TestNestedManager(t *testing.T) {
 		_, ok := n2a.GetPolicy(policyName)
 		assert.True(t, ok, "Should have found policy %s", policyName)
 
-		_, ok = n1.GetPolicy(n2a.BasePath() + "/" + policyName)
+		_, ok = n1.GetPolicy(n2a.(*ManagerImpl).BasePath() + "/" + policyName)
 		assert.True(t, ok, "Should have found policy %s", policyName)
 
-		_, ok = m.GetPolicy(n1.BasePath() + "/" + n2a.BasePath() + "/" + policyName)
+		_, ok = m.GetPolicy(n1.(*ManagerImpl).BasePath() + "/" + n2a.(*ManagerImpl).BasePath() + "/" + policyName)
 		assert.True(t, ok, "Should have found policy %s", policyName)
 
 		for i, abs := range []Manager{n2a, n1, m} {
-			absName := absPrefix + n1.BasePath() + "/" + n2a.BasePath() + "/" + policyName
+			absName := absPrefix + n1.(*ManagerImpl).BasePath() + "/" + n2a.(*ManagerImpl).BasePath() + "/" + policyName
 			_, ok = abs.GetPolicy(absName)
 			assert.True(t, ok, "Should have found absolutely policy for manager %d", i)
 		}
@@ -179,14 +179,14 @@ func TestNestedManager(t *testing.T) {
 		_, ok := n2b.GetPolicy(policyName)
 		assert.True(t, ok, "Should have found policy %s", policyName)
 
-		_, ok = n1.GetPolicy(n2b.BasePath() + "/" + policyName)
+		_, ok = n1.GetPolicy(n2b.(*ManagerImpl).BasePath() + "/" + policyName)
 		assert.True(t, ok, "Should have found policy %s", policyName)
 
-		_, ok = m.GetPolicy(n1.BasePath() + "/" + n2b.BasePath() + "/" + policyName)
+		_, ok = m.GetPolicy(n1.(*ManagerImpl).BasePath() + "/" + n2b.(*ManagerImpl).BasePath() + "/" + policyName)
 		assert.True(t, ok, "Should have found policy %s", policyName)
 
 		for i, abs := range []Manager{n2b, n1, m} {
-			absName := absPrefix + n1.BasePath() + "/" + n2b.BasePath() + "/" + policyName
+			absName := absPrefix + n1.(*ManagerImpl).BasePath() + "/" + n2b.(*ManagerImpl).BasePath() + "/" + policyName
 			_, ok = abs.GetPolicy(absName)
 			assert.True(t, ok, "Should have found absolutely policy for manager %d", i)
 		}

core/policy/mocks/mocks.go

@@ -49,14 +49,6 @@ func (m *MockChannelPolicyManager) Manager(path []string) (policies.Manager, boo
 	panic("Not implemented")
 }
 
-func (m *MockChannelPolicyManager) BasePath() string {
-	panic("Not implemented")
-}
-
-func (m *MockChannelPolicyManager) PolicyNames() []string {
-	panic("Not implemented")
-}
-
 type MockPolicy struct {
 	Deserializer msp.IdentityDeserializer
 }

peer/gossip/mocks/mocks.go

@@ -56,14 +56,6 @@ func (m *ChannelPolicyManager) Manager(path []string) (policies.Manager, bool) {
 	panic("Not implemented")
 }
 
-func (m *ChannelPolicyManager) BasePath() string {
-	panic("Not implemented")
-}
-
-func (m *ChannelPolicyManager) PolicyNames() []string {
-	panic("Not implemented")
-}
-
 type Policy struct {
 	Deserializer msp.IdentityDeserializer
 }