github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-10 16:08:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Return ERROR Status in ImportKeystores standard API endpoint if slashing protection fails (#9995)

Browse Source 
Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
This commit is contained in:
Raul Jordan
2021-12-08 14:52:05 -05:00
committed by GitHub
parent 02483ba89c
commit 4b249607da
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
validator/rpc/standard_api.go
View File

@@ -73,7 +73,14 @@ func (s *Server) ImportKeystores(
if err := slashingprotection.ImportStandardProtectionJSON(
ctx, s.valDB, bytes.NewBuffer([]byte(req.SlashingProtection)),
); err != nil {
return nil, status.Errorf(codes.Internal, "Could not import slashing protection JSON: %v", err)
statuses := make([]*ethpbservice.ImportedKeystoreStatus, len(req.Keystores))
for i := range statuses {
statuses[i] = &ethpbservice.ImportedKeystoreStatus{
Status: ethpbservice.ImportedKeystoreStatus_ERROR,
Message: fmt.Sprintf("could not import slashing protection: %v", err),
}
}
return &ethpbservice.ImportKeystoresResponse{Statuses: statuses}, nil
}
}
statuses, err := importer.ImportKeystores(ctx, keystores, req.Passwords)

12
validator/rpc/standard_api_test.go
View File

@@ -134,17 +134,23 @@ func TestServer_ImportKeystores(t *testing.T) {
numKeystores := 5
password := "12345678"
encodedKeystores := make([]string, numKeystores)
passwords := make([]string, numKeystores)
for i := 0; i < numKeystores; i++ {
enc, err := json.Marshal(createRandomKeystore(t, password))
encodedKeystores[i] = string(enc)
require.NoError(t, err)
passwords[i] = password
}
_, err := s.ImportKeystores(context.Background(), &ethpbservice.ImportKeystoresRequest{
resp, err := s.ImportKeystores(context.Background(), &ethpbservice.ImportKeystoresRequest{
Keystores: encodedKeystores,
Passwords: []string{password},
Passwords: passwords,
SlashingProtection: "foobar",
})
require.NotNil(t, err)
require.NoError(t, err)
require.Equal(t, numKeystores, len(resp.Statuses))
for _, st := range resp.Statuses {
require.Equal(t, ethpbservice.ImportedKeystoreStatus_ERROR, st.Status)
}
})
t.Run("returns proper statuses for keystores in request", func(t *testing.T) {
numKeystores := 5