Merge pull request #6853 from Flocqst/op-service/http-util-cleanup

Op service : http util cleanup

op-node/cmd/stateviz/main.go

@@ -18,8 +18,8 @@ import (
 	"sync"
 	"time"
 
-	ophttp "github.com/ethereum-optimism/optimism/op-node/http"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
+	ophttp "github.com/ethereum-optimism/optimism/op-service/httputil"
 	"github.com/ethereum/go-ethereum/log"
 )
 

op-node/metrics/metrics.go

@@ -10,8 +10,8 @@ import (
 	"strconv"
 	"time"
 
-	ophttp "github.com/ethereum-optimism/optimism/op-node/http"
 	"github.com/ethereum-optimism/optimism/op-node/p2p/store"
+	ophttp "github.com/ethereum-optimism/optimism/op-service/httputil"
 	"github.com/ethereum-optimism/optimism/op-service/metrics"
 
 	pb "github.com/libp2p/go-libp2p-pubsub/pb"

op-node/node/server.go

@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"strconv"
 
-	ophttp "github.com/ethereum-optimism/optimism/op-node/http"
+	ophttp "github.com/ethereum-optimism/optimism/op-service/httputil"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/rpc"

op-node/http/http.go → op-service/httputil/http.go

-package http
+package httputil
 
 import (
 	"net/http"

op-service/httputil/server.go

@@ -3,9 +3,7 @@ package httputil
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net/http"
-	"time"
 )
 
 func ListenAndServeContext(ctx context.Context, server *http.Server) error {
@@ -14,15 +12,6 @@ func ListenAndServeContext(ctx context.Context, server *http.Server) error {
 		errCh <- server.ListenAndServe()
 	}()
 
-	// verify that the server comes up
-	tick := time.NewTimer(10 * time.Millisecond)
-	select {
-	case err := <-errCh:
-		return fmt.Errorf("http server failed: %w", err)
-	case <-tick.C:
-		break
-	}
-
 	select {
 	case err := <-errCh:
 		if errors.Is(err, http.ErrServerClosed) {