Skip to content

Commit 94065e3

Browse files
committed
fixing errors
1 parent d3e2bdb commit 94065e3

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

beacon-chain/rpc/eth/helpers/error_handling.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ func HandleIsOptimisticError(w http.ResponseWriter, err error) {
3939
return
4040
}
4141

42-
var blockRootsNotFoundErr *lookup.BlockRootsNotFoundError
43-
if errors.As(err, &blockRootsNotFoundErr) {
42+
var blockNotFoundErr *lookup.BlockNotFoundError
43+
if errors.As(err, &blockNotFoundErr) {
4444
httputil.HandleError(w, "Could not check optimistic status: "+err.Error(), http.StatusNotFound)
4545
return
4646
}

beacon-chain/rpc/eth/helpers/sync.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func isStateRootOptimistic(
138138
return true, errors.Wrapf(err, "could not get block roots for slot %d", st.Slot())
139139
}
140140
if !has {
141-
return true, lookup.NewBlockRootsNotFoundError()
141+
return true, lookup.NewBlockNotFoundError("no block roots returned from the database")
142142
}
143143
for _, r := range roots {
144144
b, err := database.Block(ctx, r)

beacon-chain/rpc/eth/helpers/sync_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ func TestIsOptimistic(t *testing.T) {
286286
require.NoError(t, err)
287287
mf := &testutil.MockStater{BeaconState: st}
288288
_, err = IsOptimistic(ctx, []byte(hexutil.Encode(bytesutil.PadTo([]byte("root"), 32))), cs, mf, cs, db)
289-
var blockRootsNotFoundErr *lookup.BlockRootsNotFoundError
290-
require.Equal(t, true, errors.As(err, &blockRootsNotFoundErr))
289+
var blockNotFoundErr *lookup.BlockNotFoundError
290+
require.Equal(t, true, errors.As(err, &blockNotFoundErr))
291291
})
292292
})
293293

@@ -395,11 +395,11 @@ func TestHandleIsOptimisticError(t *testing.T) {
395395
})
396396
t.Run("no block roots error handled as 404", func(t *testing.T) {
397397
rr := httptest.NewRecorder()
398-
blockRootsErr := lookup.NewBlockRootsNotFoundError()
399-
HandleIsOptimisticError(rr, blockRootsErr)
398+
blockNotFoundErr := lookup.NewBlockNotFoundError("no block roots returned from the database")
399+
HandleIsOptimisticError(rr, blockNotFoundErr)
400400

401401
require.Equal(t, http.StatusNotFound, rr.Code)
402-
require.StringContains(t, blockRootsErr.Error(), rr.Body.String())
402+
require.StringContains(t, blockNotFoundErr.Error(), rr.Body.String())
403403
})
404404

405405
t.Run("generic error handled as 500", func(t *testing.T) {

0 commit comments

Comments
 (0)