Common stuff

Makefile

@@ -6,6 +6,15 @@ v:
 test:
 	go test ./...
 
+bench:
+	go test -bench=. -run=Bench ./...
+
+fmt: 
+	gofmt -s -w .
+	gci write .
+	gofumpt -w -extra .
+	go mod tidy
+
 lint:
 	gofmt -d ./
 	go vet ./...

blocksub/blocksub.go

@@ -51,7 +51,7 @@ type BlockSub struct {
 	wsConnectingCond *sync.Cond
 }
 
-func NewBlockSub(ctx context.Context, ethNodeHTTPURI string, ethNodeWebsocketURI string) *BlockSub {
+func NewBlockSub(ctx context.Context, ethNodeHTTPURI, ethNodeWebsocketURI string) *BlockSub {
 	ctx, cancel := context.WithCancel(ctx)
 	sub := &BlockSub{
 		PollTimeout:         10 * time.Second,
@@ -242,7 +242,7 @@ func (s *BlockSub) _startWebsocket() (err error) {
 
 	// Listen for headers and errors, and reconnect if needed
 	go func() {
-		var timer = time.NewTimer(s.SubTimeout)
+		timer := time.NewTimer(s.SubTimeout)
 
 		for {
 			select {

cli/cli.go

@@ -14,7 +14,7 @@ func CheckErr(err error) {
 }
 
 // GetEnv returns the value of the environment variable named by key, or defaultValue if the environment variable doesn't exist
-func GetEnv(key string, defaultValue string) string {
+func GetEnv(key, defaultValue string) string {
 	if value, ok := os.LookupEnv(key); ok {
 		return value
 	}

examples/blocksub/main.go

@@ -5,10 +5,9 @@ import (
 	"io"
 	"os"
 
-	"golang.org/x/exp/slog"
-
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/flashbots/go-utils/blocksub"
+	"golang.org/x/exp/slog"
 )
 
 var (

examples/httplogger/main.go

@@ -12,9 +12,7 @@ import (
 	"go.uber.org/zap"
 )
 
-var (
-	listenAddr = "localhost:8124"
-)
+var listenAddr = "localhost:8124"
 
 func HelloHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write([]byte("Hello, World!"))

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/stretchr/testify v1.8.4
 	go.uber.org/atomic v1.11.0
 	go.uber.org/zap v1.25.0
+	golang.org/x/crypto v0.17.0
 	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
 )
 
@@ -34,7 +35,6 @@ require (
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
 	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/sync v0.5.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect

jsonrpc/mockserver.go

@@ -84,7 +84,7 @@ func (s *MockJSONRPCServer) handleHTTPRequest(w http.ResponseWriter, req *http.R
 }
 
 func (s *MockJSONRPCServer) IncrementRequestCounter(method string) {
-	var newCount = 0
+	newCount := 0
 	currentCount, ok := s.RequestCounter.Load(method)
 	if ok {
 		newCount = currentCount.(int)