Remove unused methods from Monitor interface

common/membership/interfaces.go

@@ -68,20 +68,8 @@ type (
 		EvictSelf() error
 		Lookup(service primitives.ServiceName, key string) (HostInfo, error)
 		GetResolver(service primitives.ServiceName) (ServiceResolver, error)
-		// AddListener adds a listener for this service.
-		// The listener will get notified on the given
-		// channel, whenever there is a membership change.
-		// @service: The service to be listened on
-		// @name: The name for identifying the listener
-		// @notifyChannel: The channel on which the caller receives notifications
-		AddListener(service primitives.ServiceName, name string, notifyChannel chan<- *ChangedEvent) error
-		// RemoveListener removes a listener for this service.
-		RemoveListener(service primitives.ServiceName, name string) error
 		// GetReachableMembers returns addresses of all members of the ring
 		GetReachableMembers() ([]string, error)
-		// GetMemberCount returns the number of reachable members
-		// currently in this node's membership list for the given service
-		GetMemberCount(service primitives.ServiceName) (int, error)
 		// WaitUntilInitialized blocks until initialization is completed and returns the result
 		// of initialization. The current implementation does log.Fatal if it can't initialize,
 		// so currently this will never return non-nil, except for context cancel/timeout. A

common/membership/ringpop/monitor.go

@@ -382,34 +382,10 @@ func (rpo *monitor) Lookup(service primitives.ServiceName, key string) (membersh
 	return ring.Lookup(key)
 }
 
-func (rpo *monitor) AddListener(service primitives.ServiceName, name string, notifyChannel chan<- *membership.ChangedEvent) error {
-	ring, err := rpo.GetResolver(service)
-	if err != nil {
-		return err
-	}
-	return ring.AddListener(name, notifyChannel)
-}
-
-func (rpo *monitor) RemoveListener(service primitives.ServiceName, name string) error {
-	ring, err := rpo.GetResolver(service)
-	if err != nil {
-		return err
-	}
-	return ring.RemoveListener(name)
-}
-
 func (rpo *monitor) GetReachableMembers() ([]string, error) {
 	return rpo.rp.GetReachableMembers()
 }
 
-func (rpo *monitor) GetMemberCount(service primitives.ServiceName) (int, error) {
-	ring, err := rpo.GetResolver(service)
-	if err != nil {
-		return 0, err
-	}
-	return ring.MemberCount(), nil
-}
-
 func replaceServicePort(address string, servicePort int) (string, error) {
 	host, _, err := net.SplitHostPort(address)
 	if err != nil {

common/membership/ringpop/monitor_test.go

@@ -60,7 +60,9 @@ func (s *RpoSuite) TestMonitor() {
 	time.Sleep(time.Second)
 
 	listenCh := make(chan *membership.ChangedEvent, 5)
-	err := rpm.AddListener(serviceName, "test-listener", listenCh)
+	r, err := rpm.GetResolver(serviceName)
+	s.NoError(err)
+	err = r.AddListener("test-listener", listenCh)
 	s.Nil(err, "AddListener failed")
 
 	host, err := rpm.Lookup(serviceName, "key")
@@ -88,7 +90,7 @@ func (s *RpoSuite) TestMonitor() {
 	s.Nil(err, "Ringpop monitor failed to find host for key")
 	s.NotEqual(testService.hostAddrs[1], host.GetAddress(), "Ringpop monitor assigned key to dead host")
 
-	err = rpm.RemoveListener(serviceName, "test-listener")
+	err = r.RemoveListener("test-listener")
 	s.Nil(err, "RemoveListener() failed")
 
 	rpm.Stop()

service/frontend/workflow_handler_test.go

@@ -159,9 +159,6 @@ func (s *workflowHandlerSuite) SetupTest() {
 
 	s.tokenSerializer = common.NewProtoTaskTokenSerializer()
 
-	mockMonitor := s.mockResource.MembershipMonitor
-	mockMonitor.EXPECT().GetMemberCount(primitives.FrontendService).Return(5, nil).AnyTimes()
-
 	s.mockVisibilityMgr.EXPECT().GetStoreNames().Return([]string{elasticsearch.PersistenceName})
 }
 

tests/simpleMonitor.go

@@ -78,22 +78,10 @@ func (s *simpleMonitor) Lookup(service primitives.ServiceName, key string) (memb
 	return resolver.Lookup(key)
 }
 
-func (s *simpleMonitor) AddListener(service primitives.ServiceName, name string, notifyChannel chan<- *membership.ChangedEvent) error {
-	return nil
-}
-
-func (s *simpleMonitor) RemoveListener(service primitives.ServiceName, name string) error {
-	return nil
-}
-
 func (s *simpleMonitor) GetReachableMembers() ([]string, error) {
 	return nil, nil
 }
 
-func (s *simpleMonitor) GetMemberCount(service primitives.ServiceName) (int, error) {
-	return 0, nil
-}
-
 func (s *simpleMonitor) WaitUntilInitialized(_ context.Context) error {
 	return nil
 }