From 811ae84909ae751b3e2421b101f9de08a83effab Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Fri, 26 Aug 2022 03:49:22 +0200
Subject: [PATCH] op-proposer,op-service: fix lint and update docs

---
 op-proposer/txmgr/txmgr.go    | 3 ++-
 op-service/rpc/server_test.go | 5 +++--
 specs/meta/linting.md         | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/op-proposer/txmgr/txmgr.go b/op-proposer/txmgr/txmgr.go
index d41b064fb2e9a..11416eb15cf99 100644
--- a/op-proposer/txmgr/txmgr.go
+++ b/op-proposer/txmgr/txmgr.go
@@ -327,7 +327,8 @@ func waitMined(
 
 // CalcGasFeeCap deterministically computes the recommended gas fee cap given
 // the base fee and gasTipCap. The resulting gasFeeCap is equal to:
-//   gasTipCap + 2*baseFee.
+//
+//	gasTipCap + 2*baseFee.
 func CalcGasFeeCap(baseFee, gasTipCap *big.Int) *big.Int {
 	return new(big.Int).Add(
 		gasTipCap,
diff --git a/op-service/rpc/server_test.go b/op-service/rpc/server_test.go
index c4bfe28df0c05..a495c244e2404 100644
--- a/op-service/rpc/server_test.go
+++ b/op-service/rpc/server_test.go
@@ -2,7 +2,7 @@ package rpc
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"math/rand"
 	"net/http"
 	"testing"
@@ -41,7 +41,8 @@ func TestBaseServer(t *testing.T) {
 	t.Run("supports GET /healthz", func(t *testing.T) {
 		res, err := http.Get(fmt.Sprintf("http://%s/healthz", server.endpoint))
 		require.NoError(t, err)
-		body, err := ioutil.ReadAll(res.Body)
+		defer res.Body.Close()
+		body, err := io.ReadAll(res.Body)
 		require.NoError(t, err)
 		require.EqualValues(t, fmt.Sprintf("{\"version\":\"%s\"}\n", appVersion), string(body))
 	})
diff --git a/specs/meta/linting.md b/specs/meta/linting.md
index 606d765c8d41b..d247bb87f9bc7 100644
--- a/specs/meta/linting.md
+++ b/specs/meta/linting.md
@@ -64,5 +64,5 @@ Justification for linting rules:
 # Install linter globally (should not affect go.mod)
 go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.48.0
 # run linter, add --fix option to fix problems (where supported)
-golangci-lint run -E asciicheck,goimports,misspell
+golangci-lint run -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell
 ```