Skip to content

Commit 89967fe

Browse files
authored
Move deposit request nil check for all (#14849)
1 parent 56712b5 commit 89967fe

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

beacon-chain/core/electra/deposits.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -587,10 +587,10 @@ func processDepositRequest(beaconState state.BeaconState, request *enginev1.Depo
587587
if err != nil {
588588
return nil, errors.Wrap(err, "could not get deposit requests start index")
589589
}
590+
if request == nil {
591+
return nil, errors.New("nil deposit request")
592+
}
590593
if requestsStartIndex == params.BeaconConfig().UnsetDepositRequestsStartIndex {
591-
if request == nil {
592-
return nil, errors.New("nil deposit request")
593-
}
594594
if err := beaconState.SetDepositRequestsStartIndex(request.Index); err != nil {
595595
return nil, errors.Wrap(err, "could not set deposit requests start index")
596596
}

beacon-chain/core/electra/deposits_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ func TestProcessDepositRequests(t *testing.T) {
333333
st, _ := util.DeterministicGenesisStateElectra(t, 1)
334334
sk, err := bls.RandKey()
335335
require.NoError(t, err)
336+
require.NoError(t, st.SetDepositRequestsStartIndex(1))
336337

337338
t.Run("empty requests continues", func(t *testing.T) {
338339
newSt, err := electra.ProcessDepositRequests(context.Background(), st, []*enginev1.DepositRequest{})

changelog/tt_deposit_req_nil_check.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
### Changed
2+
3+
- Move deposit request nil check to apply all

0 commit comments

Comments
 (0)