reuse http client (metachris#14)

Author: metachris

flashbotsrpc.go

@@ -5,7 +5,7 @@ import (
 	"crypto/ecdsa"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"math/big"
 	"net/http"
@@ -56,15 +56,16 @@ type FlashbotsRPC struct {
 func New(url string, options ...func(rpc *FlashbotsRPC)) *FlashbotsRPC {
 	rpc := &FlashbotsRPC{
 		url:     url,
-		client:  http.DefaultClient,
 		log:     log.New(os.Stderr, "", log.LstdFlags),
 		Headers: make(map[string]string),
 		Timeout: 30 * time.Second,
 	}
 	for _, option := range options {
 		option(rpc)
 	}
-
+	rpc.client = &http.Client{
+		Timeout: rpc.Timeout,
+	}
 	return rpc
 }
 
@@ -115,19 +116,16 @@ func (rpc *FlashbotsRPC) Call(method string, params ...interface{}) (json.RawMes
 	for k, v := range rpc.Headers {
 		req.Header.Add(k, v)
 	}
-	httpClient := &http.Client{
-		Timeout: rpc.Timeout,
-	}
 
-	response, err := httpClient.Do(req)
+	response, err := rpc.client.Do(req)
 	if response != nil {
 		defer response.Body.Close()
 	}
 	if err != nil {
 		return nil, err
 	}
 
-	data, err := ioutil.ReadAll(response.Body)
+	data, err := io.ReadAll(response.Body)
 	if err != nil {
 		return nil, err
 	}
@@ -181,19 +179,16 @@ func (rpc *FlashbotsRPC) CallWithFlashbotsSignature(method string, privKey *ecds
 	for k, v := range rpc.Headers {
 		req.Header.Add(k, v)
 	}
-	httpClient := &http.Client{
-		Timeout: rpc.Timeout,
-	}
 
-	response, err := httpClient.Do(req)
+	response, err := rpc.client.Do(req)
 	if response != nil {
 		defer response.Body.Close()
 	}
 	if err != nil {
 		return nil, err
 	}
 
-	data, err := ioutil.ReadAll(response.Body)
+	data, err := io.ReadAll(response.Body)
 	if err != nil {
 		return nil, err
 	}

flashbotsrpc_test.go

@@ -6,7 +6,7 @@ import (
 	"crypto/ecdsa"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"math/big"
 	"net/http"
 	"strconv"
@@ -44,7 +44,7 @@ func (s *FlashbotsRPCTestSuite) registerResponseError(err error) {
 
 func (s *FlashbotsRPCTestSuite) getBody(request *http.Request) []byte {
 	defer request.Body.Close()
-	body, err := ioutil.ReadAll(request.Body)
+	body, err := io.ReadAll(request.Body)
 	s.Require().Nil(err)
 
 	return body

options.go

@@ -7,6 +7,7 @@ import (
 
 type httpClient interface {
 	Post(url string, contentType string, body io.Reader) (*http.Response, error)
+	Do(req *http.Request) (*http.Response, error)
 }
 
 type logger interface {