diff --git a/proxyd/proxyd/backend.go b/proxyd/proxyd/backend.go index 439bb47..6bc92e4 100644 --- a/proxyd/proxyd/backend.go +++ b/proxyd/proxyd/backend.go @@ -7,9 +7,6 @@ import ( "encoding/json" "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" - "github.com/google/uuid" "io" "math" "math/rand" @@ -20,6 +17,10 @@ import ( "sync" "time" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/rpc" + "github.com/google/uuid" + sw "github.com/ethereum-optimism/optimism/proxyd/pkg/avg-sliding-window" "github.com/ethereum/go-ethereum/log" @@ -415,7 +416,7 @@ func (b *Backend) doForward(ctx context.Context, rpcReqs []*RPCReq, isBatch bool originalRequests := rpcReqs translatedReqs := make(map[string]*RPCReq, len(rpcReqs)) - derivedRequests := make([]*RPCReq, 0, 0) + derivedRequests := make([]*RPCReq, 0) // translate consensus_getReceipts to receipts target // right now we only support non-batched if !isBatch { diff --git a/proxyd/proxyd/integration_tests/consensus_test.go b/proxyd/proxyd/integration_tests/consensus_test.go index b089d3d..a0ae8d4 100644 --- a/proxyd/proxyd/integration_tests/consensus_test.go +++ b/proxyd/proxyd/integration_tests/consensus_test.go @@ -802,6 +802,7 @@ func TestConsensus(t *testing.T) { var resJsonMap map[string]interface{} err = json.Unmarshal(resRaw, &resJsonMap) + require.NoError(t, err) require.Equal(t, "debug_getRawReceipts", resJsonMap["result"].(map[string]interface{})["method"].(string)) require.Equal(t, "debug_getRawReceipts", resJsonMap["result"].(map[string]interface{})["result"].(map[string]interface{})["_"]) @@ -824,6 +825,7 @@ func TestConsensus(t *testing.T) { var resJsonMap map[string]interface{} err = json.Unmarshal(resRaw, &resJsonMap) + require.NoError(t, err) require.Equal(t, "debug_getRawReceipts", resJsonMap["result"].(map[string]interface{})["method"].(string)) require.Equal(t, "debug_getRawReceipts", resJsonMap["result"].(map[string]interface{})["result"].(map[string]interface{})["_"]) diff --git a/proxyd/proxyd/tools/mockserver/handler/handler.go b/proxyd/proxyd/tools/mockserver/handler/handler.go index 99c28c5..0f6880c 100644 --- a/proxyd/proxyd/tools/mockserver/handler/handler.go +++ b/proxyd/proxyd/tools/mockserver/handler/handler.go @@ -90,6 +90,9 @@ func (mh *MockedHandler) Handler(w http.ResponseWriter, req *http.Request) { if selectedResponse != "" { var rpcRes proxyd.RPCRes err = json.Unmarshal([]byte(selectedResponse), &rpcRes) + if err != nil { + panic(err) + } idJson, _ := json.Marshal(r["id"]) rpcRes.ID = idJson res, _ := json.Marshal(rpcRes)