lint fixes

.github/workflows/checks.yml

@@ -42,7 +42,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install gofumpt
-        run: go install mvdan.cc/gofumpt@v0.4.0
+        run: go install mvdan.cc/gofumpt@v0.5.0
 
       - name: Install staticcheck
         run: go install honnef.co/go/tools/cmd/staticcheck@2023.1.7

.golangci.yaml

@@ -29,6 +29,8 @@ linters:
     - exhaustruct
     - nolintlint
     - depguard
+    - testifylint
+    - perfsprint
 
     #
     # Disabled because of generics:

Makefile

@@ -19,7 +19,7 @@ test-race:
 
 lint:
 	gofmt -d -s .
-	gofumpt -d -extra .
+	#gofumpt -d -extra .
 	go vet ./...
 	staticcheck ./...
 	golangci-lint run

mevshare/api.go

@@ -172,7 +172,7 @@ func (m *API) SendBundle(ctx context.Context, bundle SendMevBundleArgs) (_ SendM
 		}
 		bundle.Validity.Refund = []RefundConstraint{{0, refundPercent}}
 		MergePrivacyBuilders(&bundle)
-		err = MergeInclusionIntervals(&bundle.Inclusion, &unmatchedBundle.Inclusion)
+		err = MergeInclusionIntervals(&bundle.Inclusion, unmatchedBundle.Inclusion)
 		if err != nil {
 			return SendMevBundleResponse{}, ErrBackrunInclusion
 		}

mevshare/bundle_validation.go

@@ -35,7 +35,7 @@ func cleanBody(bundle *SendMevBundleArgs) {
 
 // MergeInclusionIntervals writes to the topLevel inclusion value of overlap between inner and topLevel
 // or return error if there is no overlap
-func MergeInclusionIntervals(topLevel, inner *MevBundleInclusion) error {
+func MergeInclusionIntervals(topLevel *MevBundleInclusion, inner MevBundleInclusion) error {
 	if topLevel.MaxBlock < inner.BlockNumber || inner.MaxBlock < topLevel.BlockNumber {
 		return ErrInvalidInclusion
 	}
@@ -117,7 +117,7 @@ func validateBundleInner(level int, bundle *SendMevBundleArgs, currentBlock uint
 			bodyHashes = append(bodyHashes, tx.Hash())
 			txs++
 		} else if el.Bundle != nil {
-			err = MergeInclusionIntervals(&bundle.Inclusion, &el.Bundle.Inclusion)
+			err = MergeInclusionIntervals(&bundle.Inclusion, el.Bundle.Inclusion)
 			if err != nil {
 				return hash, txs, unmatched, err
 			}

mevshare/bundle_validation_test.go

@@ -131,13 +131,14 @@ func TestMergeInclusionIntervals(t *testing.T) {
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
 			bottomCopy := c.bottom
-			err := MergeInclusionIntervals(&c.top, &bottomCopy)
+			topCopy := c.top
+			err := MergeInclusionIntervals(&topCopy, bottomCopy)
 			if c.err != nil {
 				require.ErrorIs(t, err, c.err)
 			} else {
 				require.NoError(t, err)
 			}
-			require.Equal(t, c.expectedTop, c.top)
+			require.Equal(t, c.expectedTop, topCopy)
 			require.Equal(t, c.bottom, bottomCopy)
 		})
 	}