Close the API HTTP Server When Ctx Canceled and Fix Retry Utils (#713)

api/server/server.go

@@ -14,6 +14,8 @@ import (
 
 	"github.com/gorilla/mux"
 
+	"github.com/ethereum/go-ethereum/log"
+
 	"github.com/offchainlabs/bold/api/backend"
 	"github.com/offchainlabs/bold/util/stopwaiter"
 )
@@ -53,13 +55,15 @@ func New(addr string, backend backend.BusinessLogicProvider) (*Server, error) {
 
 func (s *Server) Start(ctx context.Context) error {
 	s.StopWaiter.Start(ctx, s)
+	go func() {
+		<-ctx.Done()
+		if err := s.srv.Shutdown(ctx); err != nil {
+			log.Error("Could not shutdown API server", "err", err)
+		}
+	}()
 	return s.srv.ListenAndServe()
 }
 
-func (s *Server) Stop(ctx context.Context) error {
-	return s.srv.Shutdown(ctx)
-}
-
 func (s *Server) Addr() string {
 	return s.srv.Addr
 }

runtime/retry.go

@@ -54,7 +54,11 @@ func UntilSucceedsMultipleReturnValue[T, U any](ctx context.Context, fn func() (
 				"err", err,
 			)
 			retryCounter.Inc(1)
-			time.Sleep(cfg.sleepTime)
+			select {
+			case <-ctx.Done():
+				return zeroVal[T](), zeroVal[U](), ctx.Err()
+			case <-time.After(cfg.sleepTime):
+			}
 			continue
 		}
 		return got, got2, nil