gzip testdata (#459)

Author: metachris

README.md

@@ -107,7 +107,7 @@ go run . website --network sepolia --db postgres://postgres:postgres@localhost:5
 curl localhost:9062/eth/v1/builder/status
 
 # Send test validator registrations
-curl -X POST localhost:9062/eth/v1/builder/validators -d @testdata/valreg2.json
+curl -X POST -H'Content-Encoding: gzip' localhost:9062/eth/v1/builder/validators --data-binary @testdata/valreg2.json.gz
 
 # Delete previous registrations
 redis-cli DEL boost-relay/sepolia:validators-registration boost-relay/sepolia:validators-registration-timestamp

common/ssz_test.go

@@ -12,19 +12,16 @@ import (
 )
 
 func TestSSZBuilderSubmission(t *testing.T) {
-	depositData := new(capella.SubmitBlockRequest)
-
-	byteValue, err := os.ReadFile("../testdata/submitBlockPayloadCapella_Goerli.json")
-	require.NoError(t, err)
+	byteValue := LoadGzippedBytes(t, "../testdata/submitBlockPayloadCapella_Goerli.json.gz")
 
-	err = json.Unmarshal(byteValue, &depositData)
+	depositData := new(capella.SubmitBlockRequest)
+	err := json.Unmarshal(byteValue, &depositData)
 	require.NoError(t, err)
 
 	ssz, err := depositData.MarshalSSZ()
 	require.NoError(t, err)
 
-	sszExpectedBytes, err := os.ReadFile("../testdata/submitBlockPayloadCapella_Goerli.ssz")
-	require.NoError(t, err)
+	sszExpectedBytes := LoadGzippedBytes(t, "../testdata/submitBlockPayloadCapella_Goerli.ssz.gz")
 	require.Equal(t, sszExpectedBytes, ssz)
 
 	htr, err := depositData.HashTreeRoot()

common/test_utils.go

@@ -1,12 +1,19 @@
 package common
 
 import (
+	"compress/gzip"
+	"encoding/json"
+	"io"
+	"os"
+	"testing"
+
 	"github.com/attestantio/go-builder-client/api/capella"
 	"github.com/attestantio/go-eth2-client/spec/bellatrix"
 	consensuscapella "github.com/attestantio/go-eth2-client/spec/capella"
 	"github.com/flashbots/go-boost-utils/bls"
 	boostTypes "github.com/flashbots/go-boost-utils/types"
 	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/require"
 )
 
 // TestLog is used to log information in the test methods
@@ -71,3 +78,23 @@ func TestBuilderSubmitBlockRequest(sk *bls.SecretKey, bid *BidTraceV2) BuilderSu
 		},
 	}
 }
+
+func LoadGzippedBytes(t *testing.T, filename string) []byte {
+	t.Helper()
+	fi, err := os.Open(filename)
+	require.NoError(t, err)
+	defer fi.Close()
+	fz, err := gzip.NewReader(fi)
+	require.NoError(t, err)
+	defer fz.Close()
+	val, err := io.ReadAll(fz)
+	require.NoError(t, err)
+	return val
+}
+
+func LoadGzippedJSON(t *testing.T, filename string, dst any) {
+	t.Helper()
+	b := LoadGzippedBytes(t, filename)
+	err := json.Unmarshal(b, dst)
+	require.NoError(t, err)
+}

database/typesconv_test.go

@@ -1,22 +1,16 @@
 package database
 
 import (
-	"os"
 	"testing"
 	"time"
 
-	"github.com/attestantio/go-eth2-client/spec/capella"
 	"github.com/flashbots/mev-boost-relay/common"
 	"github.com/stretchr/testify/require"
 )
 
 func TestExecutionPayloadEntryToExecutionPayload(t *testing.T) {
-	capellaPayload := new(capella.ExecutionPayload)
-	val, err := os.ReadFile("../testdata/executionPayloadCapella_Goerli.json")
-	require.NoError(t, err)
-	err = capellaPayload.UnmarshalJSON(val)
-	require.NoError(t, err)
-
+	filename := "../testdata/executionPayloadCapella_Goerli.json.gz"
+	payloadBytes := common.LoadGzippedBytes(t, filename)
 	entry := &ExecutionPayloadEntry{
 		ID:         123,
 		Slot:       5552306,
@@ -25,10 +19,10 @@ func TestExecutionPayloadEntryToExecutionPayload(t *testing.T) {
 		ProposerPubkey: "0x8559727ee65c295279332198029c939557f4d2aba0751fc55f71d0733b8aa17cd0301232a7f21a895f81eacf55c97ec4",
 		BlockHash:      "0x1bafdc454116b605005364976b134d761dd736cb4788d25c835783b46daeb121",
 		Version:        common.ForkVersionStringCapella,
-		Payload:        string(val),
+		Payload:        string(payloadBytes),
 	}
 
 	payload, err := ExecutionPayloadEntryToExecutionPayload(entry)
 	require.NoError(t, err)
-	require.Equal(t, capellaPayload.BlockHash.String(), payload.Capella.Capella.BlockHash.String())
+	require.Equal(t, "0x1bafdc454116b605005364976b134d761dd736cb4788d25c835783b46daeb121", payload.Capella.Capella.BlockHash.String())
 }

services/api/service_test.go

@@ -9,7 +9,6 @@ import (
 	"math/big"
 	"net/http"
 	"net/http/httptest"
-	"os"
 	"testing"
 	"time"
 
@@ -372,11 +371,10 @@ func TestDataApiGetDataProposerPayloadDelivered(t *testing.T) {
 }
 
 func TestBuilderSubmitBlockSSZ(t *testing.T) {
-	requestPayloadJSONBytes, err := os.ReadFile("../../testdata/submitBlockPayloadCapella_Goerli.json")
-	require.NoError(t, err)
+	requestPayloadJSONBytes := common.LoadGzippedBytes(t, "../../testdata/submitBlockPayloadCapella_Goerli.json.gz")
 
 	req := new(common.BuilderSubmitBlockRequest)
-	err = json.Unmarshal(requestPayloadJSONBytes, &req)
+	err := json.Unmarshal(requestPayloadJSONBytes, &req)
 	require.NoError(t, err)
 
 	reqSSZ, err := req.Capella.MarshalSSZ()
@@ -397,7 +395,7 @@ func TestBuilderSubmitBlock(t *testing.T) {
 	submissionTimestamp := 1606824419
 
 	// Payload attributes
-	payloadJSONFilename := "../../testdata/submitBlockPayloadCapella_Goerli.json"
+	payloadJSONFilename := "../../testdata/submitBlockPayloadCapella_Goerli.json.gz"
 	parentHash := "0xbd3291854dc822b7ec585925cda0e18f06af28fa2886e15f52d52dd4b6f94ed6"
 	feeRec, err := types.HexToAddress("0x5cc0dde14e7256340cc820415a6022a7d1c93a35")
 	require.NoError(t, err)
@@ -429,7 +427,7 @@ func TestBuilderSubmitBlock(t *testing.T) {
 
 	// Prepare the request payload
 	req := new(common.BuilderSubmitBlockRequest)
-	requestPayloadJSONBytes, err := os.ReadFile(payloadJSONFilename)
+	requestPayloadJSONBytes := common.LoadGzippedBytes(t, payloadJSONFilename)
 	require.NoError(t, err)
 	err = json.Unmarshal(requestPayloadJSONBytes, &req)
 	require.NoError(t, err)