refactor(server): remove Wait function from Listener interface

internal/cli/start_test.go

@@ -30,13 +30,11 @@ import (
 type listenerMock struct {
 	mock.Mock
 	running chan struct{}
-	stopped chan struct{}
 }
 
 func newListenerMock() *listenerMock {
 	return &listenerMock{
 		running: make(chan struct{}, 1),
-		stopped: make(chan struct{}, 1),
 	}
 }
 
@@ -48,12 +46,6 @@ func (l *listenerMock) Start() error {
 
 func (l *listenerMock) Stop() {
 	l.Called()
-	l.stopped <- struct{}{}
-}
-
-func (l *listenerMock) Wait() {
-	l.Called()
-	<-l.stopped
 }
 
 func TestCLIRunStartLoadConfig(t *testing.T) {
@@ -88,7 +80,6 @@ func TestCLIRunStartStartStopServer(t *testing.T) {
 	s.AddListener(l)
 
 	l.On("Start").Return(nil)
-	l.On("Wait")
 	l.On("Stop")
 
 	var wg sync.WaitGroup

internal/metrics/listener.go

@@ -117,7 +117,3 @@ func (l *Listener) Stop() {
 	l.wg.Wait()
 	l.log.Debug().Msg("Listener stopped with success")
 }
-
-func (l *Listener) Wait() {
-	l.wg.Wait()
-}

internal/metrics/listener_test.go

@@ -91,17 +91,5 @@ func TestListenerStartAndStop(t *testing.T) {
 	err = l.Start()
 	require.Nil(t, err)
 
-	var wg sync.WaitGroup
-	starting := make(chan struct{})
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		close(starting)
-		l.Wait()
-	}()
-
-	<-starting
 	l.Stop()
-	wg.Wait()
 }

internal/mqtt/listener.go

@@ -113,7 +113,7 @@ func (l *Listener) Start() error {
 	return nil
 }
 
-// Stop stops the MQTT listener. Once called, it unblocks the Run function.
+// Stop stops the MQTT listener.
 func (l *Listener) Stop() {
 	l.log.Debug().Msg("Stopping listener")
 
@@ -124,7 +124,3 @@ func (l *Listener) Stop() {
 	l.wg.Wait()
 	l.log.Debug().Msg("Listener stopped with success")
 }
-
-func (l *Listener) Wait() {
-	l.wg.Wait()
-}

internal/mqtt/listener_test.go

@@ -91,19 +91,7 @@ func TestListenerStartAndStop(t *testing.T) {
 	err = l.Start()
 	require.Nil(t, err)
 
-	var wg sync.WaitGroup
-	starting := make(chan struct{})
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		close(starting)
-		l.Wait()
-	}()
-
-	<-starting
 	l.Stop()
-	wg.Wait()
 }
 
 func TestListenerHandleConnection(t *testing.T) {
@@ -123,5 +111,4 @@ func TestListenerHandleConnection(t *testing.T) {
 
 	_ = conn.Close()
 	l.Stop()
-	l.Wait()
 }

internal/server/server.go

@@ -23,15 +23,11 @@ import (
 
 // Listener is an interface for network listeners.
 type Listener interface {
-	// Start starts the listener. If the listener has already started, this function has no effect.
+	// Start starts the listener.
 	Start() error
 
-	// Stop stops the listener unblocking the Wait function. If the listener has not started, this function has no
-	// effect.
+	// Stop stops the listener.
 	Stop()
-
-	// Wait blocks until the listener stops. If the listener has not started, this function returns immediately.
-	Wait()
 }
 
 type serverListener struct {
@@ -102,7 +98,6 @@ func (s *Server) stopRunningListeners() {
 	for _, lsn := range s.listeners {
 		if lsn.running {
 			lsn.listener.Stop()
-			lsn.listener.Wait()
 			lsn.running = false
 			s.wg.Done()
 		}

internal/server/server_test.go

@@ -42,11 +42,6 @@ func (l *listenerMock) Stop() {
 	l.wg.Done()
 }
 
-func (l *listenerMock) Wait() {
-	l.Called()
-	l.wg.Wait()
-}
-
 func newLogger() *logger.Logger {
 	out := bytes.NewBufferString("")
 	return logger.New(out, nil, logger.Json)
@@ -85,7 +80,6 @@ func TestServerStop(t *testing.T) {
 	require.Nil(t, err)
 
 	l.On("Stop")
-	l.On("Wait")
 	s.Stop()
 	l.AssertExpectations(t)
 }
@@ -109,7 +103,6 @@ func TestServerStartWithListenerErrorMultipleListeners(t *testing.T) {
 
 	l1 := &listenerMock{}
 	l1.On("Start").Return(nil)
-	l1.On("Wait")
 	l1.On("Stop")
 	s.AddListener(l1)