Updated return statements to latest changes

onflow · Dec 16, 2024 · 911e6cd · 911e6cd
1 parent ac529ad
commit 911e6cd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/engine/access/rest/websockets/controller.go b/engine/access/rest/websockets/controller.go
@@ -125,7 +125,7 @@ func (c *Controller) keepalive(ctx context.Context) error {
 	for {
 		select {
 		case <-ctx.Done():
-			return ctx.Err()
+			return nil
 		case <-pingTicker.C:
 			err := c.conn.WriteControl(websocket.PingMessage, time.Now().Add(WriteWait))
 			if err != nil {
@@ -158,7 +158,7 @@ func (c *Controller) writeMessages(ctx context.Context) error {
 	for {
 		select {
 		case <-ctx.Done():
-			return ctx.Err()
+			return nil
 		case message, ok := <-c.multiplexedStream:
 			if !ok {
 				return fmt.Errorf("multiplexed stream closed")

diff --git a/engine/access/rest/websockets/controller_test.go b/engine/access/rest/websockets/controller_test.go
@@ -896,8 +896,7 @@ func (s *WsControllerSuite) TestKeepaliveRoutine() {
 
 		// Start the keepalive process with the context canceled
 		err := controller.keepalive(ctx)
-		s.Require().Error(err)
-		s.Require().ErrorIs(context.Canceled, err) //TODO: should be nil
+		s.Require().NoError(err)
 
 		conn.AssertExpectations(t) // Should not invoke WriteMessage after context cancellation
 	})