tornadocontrib/infra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
Felipe Andrade 2023-06-01 13:36:13 -07:00
parent 33881542a9
commit eb0fc1a837
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
proxyd/proxyd/backend.go
View File

@ -7,9 +7,6 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/rpc"
"github.com/google/uuid"
"io" "io"
"math" "math"
"math/rand" "math/rand"
@ -20,6 +17,10 @@ import (
"sync" "sync"
"time" "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" sw "github.com/ethereum-optimism/optimism/proxyd/pkg/avg-sliding-window"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
@ -415,7 +416,7 @@ func (b *Backend) doForward(ctx context.Context, rpcReqs []*RPCReq, isBatch bool
originalRequests := rpcReqs originalRequests := rpcReqs
translatedReqs := make(map[string]*RPCReq, len(rpcReqs)) translatedReqs := make(map[string]*RPCReq, len(rpcReqs))
derivedRequests := make([]*RPCReq, 0, 0) derivedRequests := make([]*RPCReq, 0)
// translate consensus_getReceipts to receipts target // translate consensus_getReceipts to receipts target
// right now we only support non-batched // right now we only support non-batched
if !isBatch { if !isBatch {

2
proxyd/proxyd/integration_tests/consensus_test.go
View File

@ -802,6 +802,7 @@ func TestConsensus(t *testing.T) {
var resJsonMap map[string]interface{} var resJsonMap map[string]interface{}
err = json.Unmarshal(resRaw, &resJsonMap) 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{})["method"].(string))
require.Equal(t, "debug_getRawReceipts", resJsonMap["result"].(map[string]interface{})["result"].(map[string]interface{})["_"]) 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{} var resJsonMap map[string]interface{}
err = json.Unmarshal(resRaw, &resJsonMap) 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{})["method"].(string))
require.Equal(t, "debug_getRawReceipts", resJsonMap["result"].(map[string]interface{})["result"].(map[string]interface{})["_"]) require.Equal(t, "debug_getRawReceipts", resJsonMap["result"].(map[string]interface{})["result"].(map[string]interface{})["_"])

3
proxyd/proxyd/tools/mockserver/handler/handler.go
View File

@ -90,6 +90,9 @@ func (mh *MockedHandler) Handler(w http.ResponseWriter, req *http.Request) {
if selectedResponse != "" { if selectedResponse != "" {
var rpcRes proxyd.RPCRes var rpcRes proxyd.RPCRes
err = json.Unmarshal([]byte(selectedResponse), &rpcRes) err = json.Unmarshal([]byte(selectedResponse), &rpcRes)
if err != nil {
panic(err)
}
idJson, _ := json.Marshal(r["id"]) idJson, _ := json.Marshal(r["id"])
rpcRes.ID = idJson rpcRes.ID = idJson
res, _ := json.Marshal(rpcRes) res, _ := json.Marshal(rpcRes)