mirror/prysm-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/prysm-pulse.git synced 2025-01-11 04:00:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix DeepSource errors in the Validator's REST API (#11726)

Browse Source
This commit is contained in:
Patrice Vignola 2022-12-06 12:31:56 -08:00 committed by GitHub
parent 19af1d2bb0
commit 05148dbc8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
validator/client/beacon-api/beacon_api_validator_client.go
View File

@ -22,7 +22,11 @@ type beaconApiValidatorClient struct {
fallbackClient iface.ValidatorClient fallbackClient iface.ValidatorClient
} }
func NewBeaconApiValidatorClient(host string, timeout time.Duration) *beaconApiValidatorClient { func NewBeaconApiValidatorClient(host string, timeout time.Duration) iface.ValidatorClient {
return NewBeaconApiValidatorClientWithFallback(host, timeout, nil)
}
func NewBeaconApiValidatorClientWithFallback(host string, timeout time.Duration, fallbackClient iface.ValidatorClient) iface.ValidatorClient {
jsonRestHandler := beaconApiJsonRestHandler{ jsonRestHandler := beaconApiJsonRestHandler{
httpClient: http.Client{Timeout: timeout}, httpClient: http.Client{Timeout: timeout},
host: host, host: host,
@ -31,15 +35,10 @@ func NewBeaconApiValidatorClient(host string, timeout time.Duration) *beaconApiV
return &beaconApiValidatorClient{ return &beaconApiValidatorClient{
genesisProvider: beaconApiGenesisProvider{jsonRestHandler: jsonRestHandler}, genesisProvider: beaconApiGenesisProvider{jsonRestHandler: jsonRestHandler},
jsonRestHandler: jsonRestHandler, jsonRestHandler: jsonRestHandler,
fallbackClient: fallbackClient,
} }
} }
func NewBeaconApiValidatorClientWithFallback(url string, timeout time.Duration, fallbackClient iface.ValidatorClient) *beaconApiValidatorClient {
beaconApiValidatorClient := NewBeaconApiValidatorClient(url, timeout)
beaconApiValidatorClient.fallbackClient = fallbackClient
return beaconApiValidatorClient
}
func (c *beaconApiValidatorClient) GetDuties(ctx context.Context, in *ethpb.DutiesRequest) (*ethpb.DutiesResponse, error) { func (c *beaconApiValidatorClient) GetDuties(ctx context.Context, in *ethpb.DutiesRequest) (*ethpb.DutiesResponse, error) {
if c.fallbackClient != nil { if c.fallbackClient != nil {
return c.fallbackClient.GetDuties(ctx, in) return c.fallbackClient.GetDuties(ctx, in)

10
validator/client/beacon-api/index_test.go
View File

@ -21,7 +21,7 @@ import (
const stringPubKey = "0x8000091c2ae64ee414a54c1cc1fc67dec663408bc636cb86756e0200e41a75c8f86603f104f02c856983d2783116be13" const stringPubKey = "0x8000091c2ae64ee414a54c1cc1fc67dec663408bc636cb86756e0200e41a75c8f86603f104f02c856983d2783116be13"
func getPubKeyAndURL(t *testing.T, stringPubkey string) ([]byte, string) { func getPubKeyAndURL(t *testing.T) ([]byte, string) {
baseUrl := "/eth/v1/beacon/states/head/validators" baseUrl := "/eth/v1/beacon/states/head/validators"
url := fmt.Sprintf("%s?id=%s", baseUrl, stringPubKey) url := fmt.Sprintf("%s?id=%s", baseUrl, stringPubKey)
@ -35,7 +35,7 @@ func TestIndex_Nominal(t *testing.T) {
ctrl := gomock.NewController(t) ctrl := gomock.NewController(t)
defer ctrl.Finish() defer ctrl.Finish()
pubKey, url := getPubKeyAndURL(t, stringPubKey) pubKey, url := getPubKeyAndURL(t)
stateValidatorsResponseJson := rpcmiddleware.StateValidatorsResponseJson{} stateValidatorsResponseJson := rpcmiddleware.StateValidatorsResponseJson{}
jsonRestHandler := mock.NewMockjsonRestHandler(ctrl) jsonRestHandler := mock.NewMockjsonRestHandler(ctrl)
@ -78,7 +78,7 @@ func TestIndex_UnexistingValidator(t *testing.T) {
ctrl := gomock.NewController(t) ctrl := gomock.NewController(t)
defer ctrl.Finish() defer ctrl.Finish()
pubKey, url := getPubKeyAndURL(t, stringPubKey) pubKey, url := getPubKeyAndURL(t)
stateValidatorsResponseJson := rpcmiddleware.StateValidatorsResponseJson{} stateValidatorsResponseJson := rpcmiddleware.StateValidatorsResponseJson{}
jsonRestHandler := mock.NewMockjsonRestHandler(ctrl) jsonRestHandler := mock.NewMockjsonRestHandler(ctrl)
@ -113,7 +113,7 @@ func TestIndex_BadIndexError(t *testing.T) {
ctrl := gomock.NewController(t) ctrl := gomock.NewController(t)
defer ctrl.Finish() defer ctrl.Finish()
pubKey, url := getPubKeyAndURL(t, stringPubKey) pubKey, url := getPubKeyAndURL(t)
stateValidatorsResponseJson := rpcmiddleware.StateValidatorsResponseJson{} stateValidatorsResponseJson := rpcmiddleware.StateValidatorsResponseJson{}
jsonRestHandler := mock.NewMockjsonRestHandler(ctrl) jsonRestHandler := mock.NewMockjsonRestHandler(ctrl)
@ -155,7 +155,7 @@ func TestIndex_JsonResponseError(t *testing.T) {
ctrl := gomock.NewController(t) ctrl := gomock.NewController(t)
defer ctrl.Finish() defer ctrl.Finish()
pubKey, url := getPubKeyAndURL(t, stringPubKey) pubKey, url := getPubKeyAndURL(t)
stateValidatorsResponseJson := rpcmiddleware.StateValidatorsResponseJson{} stateValidatorsResponseJson := rpcmiddleware.StateValidatorsResponseJson{}
jsonRestHandler := mock.NewMockjsonRestHandler(ctrl) jsonRestHandler := mock.NewMockjsonRestHandler(ctrl)

6
validator/client/beacon-api/json_rest_handler_test.go
View File

@ -157,7 +157,7 @@ func TestGetRestJsonResponse_Error(t *testing.T) {
} }
func httpErrorJsonHandler(statusCode int, errorMessage string) func(w http.ResponseWriter, r *http.Request) { func httpErrorJsonHandler(statusCode int, errorMessage string) func(w http.ResponseWriter, r *http.Request) {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, _ *http.Request) {
errorJson := &apimiddleware.DefaultErrorJson{ errorJson := &apimiddleware.DefaultErrorJson{
Code: statusCode, Code: statusCode,
Message: errorMessage, Message: errorMessage,
@ -176,7 +176,7 @@ func httpErrorJsonHandler(statusCode int, errorMessage string) func(w http.Respo
} }
} }
func invalidJsonErrHandler(w http.ResponseWriter, r *http.Request) { func invalidJsonErrHandler(w http.ResponseWriter, _ *http.Request) {
w.WriteHeader(http.StatusNotFound) w.WriteHeader(http.StatusNotFound)
_, err := w.Write([]byte("foo")) _, err := w.Write([]byte("foo"))
if err != nil { if err != nil {
@ -184,7 +184,7 @@ func invalidJsonErrHandler(w http.ResponseWriter, r *http.Request) {
} }
} }
func invalidJsonResponseHandler(w http.ResponseWriter, r *http.Request) { func invalidJsonResponseHandler(w http.ResponseWriter, _ *http.Request) {
_, err := w.Write([]byte("foo")) _, err := w.Write([]byte("foo"))
if err != nil { if err != nil {
panic(err) panic(err)