update to go v1.22 (flashbots#627)

.github/workflows/lint.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.21.0
+          go-version: ^1.22.0
           id: go
 
       - name: Ensure go mod tidy runs without changes
@@ -27,13 +27,13 @@ jobs:
           git diff-index --quiet HEAD
 
       - name: Install gofumpt
-        run: go install mvdan.cc/gofumpt@v0.4.0
+        run: go install mvdan.cc/gofumpt@v0.6.0
 
       - name: Install staticcheck
         run: go install honnef.co/go/tools/cmd/[email protected]
 
       - name: Install golangci-lint
-        run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.0
+        run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.1
 
       - name: Lint
         run: make lint

.github/workflows/release.yaml

@@ -71,7 +71,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.21
+          go-version: ^1.22
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v3
         with:
@@ -101,7 +101,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.21
+          go-version: ^1.22
       - name: Make directories
         run: |
           mkdir -p ./build

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.21
+          go-version: ^1.22
         id: go
 
       - name: Checkout sources

.golangci.yml

@@ -31,6 +31,7 @@ linters:
     - ireturn
     - noctx
     - tagliatelle
+    - perfsprint
 
     #
     # Disabled because of generics:

CONTRIBUTING.md

@@ -6,14 +6,7 @@ Please start by reading our [code of conduct](CODE_OF_CONDUCT.md).
 
 ## Set up
 
-Install a few dev dependencies for `make lint`:
-
-```bash
-go install github.com/mgechev/[email protected]
-go install mvdan.cc/[email protected]
-go install honnef.co/go/tools/cmd/[email protected]
-go install github.com/golangci/golangci-lint/cmd/[email protected]
-```
+Install a few dev dependencies for `make lint`: https://github.com/flashbots/mev-boost/blob/go122/.github/workflows/lint.yml#L29-L37
 
 Look at the [README for instructions to install the dependencies and build `mev-boost`](README.md#installing)
 

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM golang:1.21 as builder
+FROM golang:1.22 as builder
 ARG VERSION
 WORKDIR /build
 

Makefile

@@ -23,6 +23,7 @@ v:
 
 .PHONY: build
 build:
+	@go version
 	CGO_ENABLED=0 go build $(GO_BUILD_FLAGS) -o mev-boost
 
 .PHONY: build-testcli

cmd/test-cli/main.go

@@ -36,7 +36,6 @@ func doRegisterValidator(v validatorPrivateData, boostEndpoint string, builderSi
 		log.WithError(err).Fatal("Could not prepare registration message")
 	}
 	_, err = server.SendHTTPRequest(context.TODO(), *http.DefaultClient, http.MethodPost, boostEndpoint+"/eth/v1/builder/validators", "test-cli", nil, message, nil)
-
 	if err != nil {
 		log.WithError(err).Fatal("Validator registration not successful")
 	}

server/errors.go

@@ -1,9 +1,9 @@
 package server
 
-import "fmt"
+import "errors"
 
 // ErrMissingRelayPubkey is returned if a new RelayEntry URL has no public key.
-var ErrMissingRelayPubkey = fmt.Errorf("missing relay public key")
+var ErrMissingRelayPubkey = errors.New("missing relay public key")
 
 // ErrPointAtInfinityPubkey is returned if a new RelayEntry URL has an all-zero public key.
-var ErrPointAtInfinityPubkey = fmt.Errorf("relay public key cannot be the point-at-infinity")
+var ErrPointAtInfinityPubkey = errors.New("relay public key cannot be the point-at-infinity")

server/service_test.go

@@ -207,7 +207,7 @@ func TestWebserverMaxHeaderSize(t *testing.T) {
 	backend.boost.listenAddr = addr
 	go func() {
 		err := backend.boost.StartHTTPServer()
-		require.NoError(t, err)
+		require.NoError(t, err) //nolint:testifylint
 	}()
 	time.Sleep(time.Millisecond * 100)
 	path := "http://" + addr + "?" + strings.Repeat("abc", 4000) // path with characters of size over 4kb
@@ -275,7 +275,7 @@ func TestRegisterValidator(t *testing.T) {
 		require.Equal(t, 1, backend.relays[1].GetRequestCount(path))
 
 		// Now make one relay return an error
-		backend.relays[0].overrideHandleRegisterValidator(func(w http.ResponseWriter, r *http.Request) {
+		backend.relays[0].overrideHandleRegisterValidator(func(w http.ResponseWriter, _ *http.Request) {
 			w.WriteHeader(http.StatusBadRequest)
 		})
 		rr = backend.request(t, http.MethodPost, path, payload)
@@ -284,7 +284,7 @@ func TestRegisterValidator(t *testing.T) {
 		require.Equal(t, 2, backend.relays[1].GetRequestCount(path))
 
 		// Now make both relays return an error - which should cause the request to fail
-		backend.relays[1].overrideHandleRegisterValidator(func(w http.ResponseWriter, r *http.Request) {
+		backend.relays[1].overrideHandleRegisterValidator(func(w http.ResponseWriter, _ *http.Request) {
 			w.WriteHeader(http.StatusBadRequest)
 		})
 		rr = backend.request(t, http.MethodPost, path, payload)
@@ -688,7 +688,7 @@ func TestGetPayload(t *testing.T) {
 		backend := newTestBackend(t, 1, 2*time.Second)
 
 		count := 0
-		backend.relays[0].handlerOverrideGetPayload = func(w http.ResponseWriter, r *http.Request) {
+		backend.relays[0].handlerOverrideGetPayload = func(w http.ResponseWriter, _ *http.Request) {
 			if count > 0 {
 				// success response on the second attempt
 				backend.relays[0].defaultHandleGetPayload(w)
@@ -709,7 +709,7 @@ func TestGetPayload(t *testing.T) {
 		count := 0
 		maxRetries := 5
 
-		backend.relays[0].handlerOverrideGetPayload = func(w http.ResponseWriter, r *http.Request) {
+		backend.relays[0].handlerOverrideGetPayload = func(w http.ResponseWriter, _ *http.Request) {
 			count++
 			if count > maxRetries {
 				// success response after max retry attempts

server/utils_test.go

@@ -46,7 +46,7 @@ func TestSendHTTPRequestUserAgent(t *testing.T) {
 	// Test with custom UA
 	customUA := "test-user-agent"
 	expectedUA := fmt.Sprintf("mev-boost/%s %s", config.Version, customUA)
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	ts := httptest.NewServer(http.HandlerFunc(func(_ http.ResponseWriter, r *http.Request) {
 		require.Equal(t, expectedUA, r.Header.Get("User-Agent"))
 		done <- true
 	}))
@@ -58,7 +58,7 @@ func TestSendHTTPRequestUserAgent(t *testing.T) {
 
 	// Test without custom UA
 	expectedUA = fmt.Sprintf("mev-boost/%s", config.Version)
-	ts = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	ts = httptest.NewServer(http.HandlerFunc(func(_ http.ResponseWriter, r *http.Request) {
 		require.Equal(t, expectedUA, r.Header.Get("User-Agent"))
 		done <- true
 	}))