validator client on rest mode has an inappropriate context deadline for events

api/client/event/event_stream.go

@@ -106,7 +106,10 @@ func (h *EventStream) Subscribe(eventsChannel chan<- *Event) {
 	var eventType, data string // Variables to store event type and data
 
 	// Iterate over lines of the event stream
-	for scanner.Scan() {
+	for {
+		if ok := scanner.Scan(); !ok {
+			break
+		}
 		select {
 		case <-h.ctx.Done():
 			log.Info("Context canceled, stopping event stream")

beacon-chain/rpc/eth/events/BUILD.bazel

@@ -25,7 +25,7 @@ go_library(
         "//runtime/version:go_default_library",
         "//time/slots:go_default_library",
         "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
-        "@com_github_sirupsen_logrus//:go_default_library",
+        "@com_github_pkg_errors//:go_default_library",
         "@io_opencensus_go//trace:go_default_library",
     ],
 )