From 9a4626856a536b8980ffd05c119b6b72063b8104 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Sat, 27 Aug 2022 03:39:30 +0200
Subject: [PATCH] style(batch-submitter,bss-core,proxyd): Fix lint Go (#3328)

* style(batch-submitter): fix lint

* style(bss-core): fix lint

* chore(proxyd): use io and os instead of deprecated ioutil methods, fixes lint
---
 proxyd/proxyd/backend.go                             | 3 +--
 proxyd/proxyd/integration_tests/mock_backend_test.go | 8 ++++----
 proxyd/proxyd/integration_tests/util_test.go         | 4 ++--
 proxyd/proxyd/rpc.go                                 | 3 +--
 proxyd/proxyd/server.go                              | 3 +--
 proxyd/proxyd/tls.go                                 | 4 ++--
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/proxyd/proxyd/backend.go b/proxyd/proxyd/backend.go
index 80de372..9a004d0 100644
--- a/proxyd/proxyd/backend.go
+++ b/proxyd/proxyd/backend.go
@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math"
 	"math/rand"
 	"net/http"
@@ -408,7 +407,7 @@ func (b *Backend) doForward(ctx context.Context, rpcReqs []*RPCReq, isBatch bool
 	}
 
 	defer httpRes.Body.Close()
-	resB, err := ioutil.ReadAll(io.LimitReader(httpRes.Body, b.maxResponseSize))
+	resB, err := io.ReadAll(io.LimitReader(httpRes.Body, b.maxResponseSize))
 	if err != nil {
 		return nil, wrapErr(err, "error reading response body")
 	}
diff --git a/proxyd/proxyd/integration_tests/mock_backend_test.go b/proxyd/proxyd/integration_tests/mock_backend_test.go
index aa8f0ba..ade879c 100644
--- a/proxyd/proxyd/integration_tests/mock_backend_test.go
+++ b/proxyd/proxyd/integration_tests/mock_backend_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -122,7 +122,7 @@ func (h *BatchRPCResponseRouter) ServeHTTP(w http.ResponseWriter, r *http.Reques
 	h.mtx.Lock()
 	defer h.mtx.Unlock()
 
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		panic(err)
 	}
@@ -241,12 +241,12 @@ func (m *MockBackend) Requests() []*RecordedRequest {
 
 func (m *MockBackend) wrappedHandler(w http.ResponseWriter, r *http.Request) {
 	m.mtx.Lock()
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		panic(err)
 	}
 	clone := r.Clone(context.Background())
-	clone.Body = ioutil.NopCloser(bytes.NewReader(body))
+	clone.Body = io.NopCloser(bytes.NewReader(body))
 	m.requests = append(m.requests, &RecordedRequest{
 		Method:  r.Method,
 		Headers: r.Header.Clone(),
diff --git a/proxyd/proxyd/integration_tests/util_test.go b/proxyd/proxyd/integration_tests/util_test.go
index 2e443f6..db52d2f 100644
--- a/proxyd/proxyd/integration_tests/util_test.go
+++ b/proxyd/proxyd/integration_tests/util_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"testing"
@@ -67,7 +67,7 @@ func (p *ProxydHTTPClient) SendRequest(body []byte) ([]byte, int, error) {
 	}
 	defer res.Body.Close()
 	code := res.StatusCode
-	resBody, err := ioutil.ReadAll(res.Body)
+	resBody, err := io.ReadAll(res.Body)
 	if err != nil {
 		panic(err)
 	}
diff --git a/proxyd/proxyd/rpc.go b/proxyd/proxyd/rpc.go
index ccd7c5f..e34b010 100644
--- a/proxyd/proxyd/rpc.go
+++ b/proxyd/proxyd/rpc.go
@@ -3,7 +3,6 @@ package proxyd
 import (
 	"encoding/json"
 	"io"
-	"io/ioutil"
 	"strings"
 )
 
@@ -103,7 +102,7 @@ func ParseBatchRPCReq(body []byte) ([]json.RawMessage, error) {
 }
 
 func ParseRPCRes(r io.Reader) (*RPCRes, error) {
-	body, err := ioutil.ReadAll(r)
+	body, err := io.ReadAll(r)
 	if err != nil {
 		return nil, wrapErr(err, "error reading RPC response")
 	}
diff --git a/proxyd/proxyd/server.go b/proxyd/proxyd/server.go
index 5f76e3e..86d7d5f 100644
--- a/proxyd/proxyd/server.go
+++ b/proxyd/proxyd/server.go
@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math"
 	"net/http"
 	"strconv"
@@ -236,7 +235,7 @@ func (s *Server) HandleRPC(w http.ResponseWriter, r *http.Request) {
 		"user_agent", userAgent,
 	)
 
-	body, err := ioutil.ReadAll(io.LimitReader(r.Body, s.maxBodySize))
+	body, err := io.ReadAll(io.LimitReader(r.Body, s.maxBodySize))
 	if err != nil {
 		log.Error("error reading request body", "err", err)
 		writeRPCError(ctx, w, nil, ErrInternal)
diff --git a/proxyd/proxyd/tls.go b/proxyd/proxyd/tls.go
index 34b214c..ed2bdaf 100644
--- a/proxyd/proxyd/tls.go
+++ b/proxyd/proxyd/tls.go
@@ -4,11 +4,11 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"errors"
-	"io/ioutil"
+	"os"
 )
 
 func CreateTLSClient(ca string) (*tls.Config, error) {
-	pem, err := ioutil.ReadFile(ca)
+	pem, err := os.ReadFile(ca)
 	if err != nil {
 		return nil, wrapErr(err, "error reading CA")
 	}