Skip to content

Commit 7344320

Browse files
authored
Remove proto state (OffchainLabs#11445)
* Remove native state flag and use native state in spectests * remove feature from tests * use e2e config in slasher simulator * use params.BeaconConfig in testutil * use correct function * use minimal config in go_test * fix TestListValidators * parameterize sync committee bits and aggregation bits * Fix TestServer_ListIndexedAttestations_GenesisEpoch (cherry picked from commit 254ab623dde08ae8886b152facdbbd8889ed79db) * fix more tests * fix even more * moreeee * aaaand more * one more fix * one more * simplify TestGetAltairDuties_UnknownPubkey * comment out problematic test * one more fix * one more * aaaand one more * another * use fieldparams in HydrateBlindedBeaconBlockBodyBellatrix * create new package for mainnet tests * TestServer_GetBellatrixBeaconBlock * change slashed validator index * clear cache in reward_test.go * deprecate flag * create bazel mainnet target * move attester mainnet test to mainnet target * "fix" proposer tests * use minimal config in TestServer_circuitBreakBuilder * fix TestProposer_ProposeBlock_OK * more fixes in validator package * more fixes * more fixes * test code * move TestProposer_GetBeaconBlock_BellatrixEpoch to minimal * finally * remove proposer_bellatrix_mainnet_test.go * fix TestServer_GetBellatrixBeaconBlock_HappyCase * fix TestServer_GetBellatrixBeaconBlock_BuilderCase * Preston needs to fix this! * Revert "Preston needs to fix this!" This reverts commit b03d97a. * remove proto state tests * fix migration tests * static analysis fix * review * remove proto state * swap state in tests * fix BUILD file in /proto/testing * remove metrics test with nil state
1 parent 9c2c665 commit 7344320

File tree

205 files changed

+443
-8979
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+443
-8979
lines changed

beacon-chain/blockchain/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,8 @@ go_test(
132132
"//beacon-chain/execution/testing:go_default_library",
133133
"//beacon-chain/forkchoice/types:go_default_library",
134134
"//beacon-chain/p2p:go_default_library",
135+
"//beacon-chain/state/state-native:go_default_library",
135136
"//beacon-chain/state/stateutil:go_default_library",
136-
"//beacon-chain/state/v1:go_default_library",
137-
"//beacon-chain/state/v3:go_default_library",
138137
"//config/fieldparams:go_default_library",
139138
"//config/params:go_default_library",
140139
"//consensus-types/blocks:go_default_library",

beacon-chain/blockchain/chain_info_test.go

+8-9
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ import (
1010
"github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/protoarray"
1111
forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types"
1212
"github.com/prysmaticlabs/prysm/v3/beacon-chain/state"
13+
state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native"
1314
"github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen"
14-
v1 "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/v1"
15-
v3 "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/v3"
1615
fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams"
1716
"github.com/prysmaticlabs/prysm/v3/config/params"
1817
"github.com/prysmaticlabs/prysm/v3/consensus-types/blocks"
@@ -61,7 +60,7 @@ func prepareForkchoiceState(
6160
}
6261

6362
base.BlockRoots[0] = append(base.BlockRoots[0], blockRoot[:]...)
64-
st, err := v3.InitializeFromProto(base)
63+
st, err := state_native.InitializeFromProtoBellatrix(base)
6564
return st, blockRoot, err
6665
}
6766

@@ -125,7 +124,7 @@ func TestCurrentJustifiedCheckpt_CanRetrieve(t *testing.T) {
125124

126125
func TestHeadSlot_CanRetrieve(t *testing.T) {
127126
c := &Service{}
128-
s, err := v1.InitializeFromProto(&ethpb.BeaconState{})
127+
s, err := state_native.InitializeFromProtoPhase0(&ethpb.BeaconState{})
129128
require.NoError(t, err)
130129
c.head = &head{slot: 100, state: s}
131130
assert.Equal(t, types.Slot(100), c.HeadSlot())
@@ -179,7 +178,7 @@ func TestHeadRoot_UseDB(t *testing.T) {
179178
func TestHeadBlock_CanRetrieve(t *testing.T) {
180179
b := util.NewBeaconBlock()
181180
b.Block.Slot = 1
182-
s, err := v1.InitializeFromProto(&ethpb.BeaconState{})
181+
s, err := state_native.InitializeFromProtoPhase0(&ethpb.BeaconState{})
183182
require.NoError(t, err)
184183
wsb, err := blocks.NewSignedBeaconBlock(b)
185184
require.NoError(t, err)
@@ -194,7 +193,7 @@ func TestHeadBlock_CanRetrieve(t *testing.T) {
194193
}
195194

196195
func TestHeadState_CanRetrieve(t *testing.T) {
197-
s, err := v1.InitializeFromProto(&ethpb.BeaconState{Slot: 2, GenesisValidatorsRoot: params.BeaconConfig().ZeroHash[:]})
196+
s, err := state_native.InitializeFromProtoPhase0(&ethpb.BeaconState{Slot: 2, GenesisValidatorsRoot: params.BeaconConfig().ZeroHash[:]})
198197
require.NoError(t, err)
199198
c := &Service{}
200199
c.head = &head{state: s}
@@ -211,7 +210,7 @@ func TestGenesisTime_CanRetrieve(t *testing.T) {
211210

212211
func TestCurrentFork_CanRetrieve(t *testing.T) {
213212
f := &ethpb.Fork{Epoch: 999}
214-
s, err := v1.InitializeFromProto(&ethpb.BeaconState{Fork: f})
213+
s, err := state_native.InitializeFromProtoPhase0(&ethpb.BeaconState{Fork: f})
215214
require.NoError(t, err)
216215
c := &Service{}
217216
c.head = &head{state: s}
@@ -236,7 +235,7 @@ func TestGenesisValidatorsRoot_CanRetrieve(t *testing.T) {
236235
c := &Service{}
237236
assert.Equal(t, [32]byte{}, c.GenesisValidatorsRoot(), "Did not get correct genesis validators root")
238237

239-
s, err := v1.InitializeFromProto(&ethpb.BeaconState{GenesisValidatorsRoot: []byte{'a'}})
238+
s, err := state_native.InitializeFromProtoPhase0(&ethpb.BeaconState{GenesisValidatorsRoot: []byte{'a'}})
240239
require.NoError(t, err)
241240
c.head = &head{state: s}
242241
assert.Equal(t, [32]byte{'a'}, c.GenesisValidatorsRoot(), "Did not get correct genesis validators root")
@@ -250,7 +249,7 @@ func TestHeadETH1Data_Nil(t *testing.T) {
250249

251250
func TestHeadETH1Data_CanRetrieve(t *testing.T) {
252251
d := &ethpb.Eth1Data{DepositCount: 999}
253-
s, err := v1.InitializeFromProto(&ethpb.BeaconState{Eth1Data: d})
252+
s, err := state_native.InitializeFromProtoPhase0(&ethpb.BeaconState{Eth1Data: d})
254253
require.NoError(t, err)
255254
c := &Service{}
256255
c.head = &head{state: s}

beacon-chain/blockchain/process_block_test.go

-15
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
"github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations"
3030
"github.com/prysmaticlabs/prysm/v3/beacon-chain/state"
3131
"github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen"
32-
v1 "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/v1"
3332
fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams"
3433
"github.com/prysmaticlabs/prysm/v3/config/params"
3534
consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks"
@@ -1125,20 +1124,6 @@ func TestVerifyBlkDescendant(t *testing.T) {
11251124
}
11261125
}
11271126

1128-
func TestHandleEpochBoundary_BadMetrics(t *testing.T) {
1129-
ctx := context.Background()
1130-
opts := testServiceOptsNoDB()
1131-
service, err := NewService(ctx, opts...)
1132-
require.NoError(t, err)
1133-
1134-
s, err := util.NewBeaconState()
1135-
require.NoError(t, err)
1136-
require.NoError(t, s.SetSlot(1))
1137-
service.head = &head{state: (*v1.BeaconState)(nil)}
1138-
1139-
require.ErrorContains(t, "failed to initialize precompute: nil inner state", service.handleEpochBoundary(ctx, s))
1140-
}
1141-
11421127
func TestHandleEpochBoundary_UpdateFirstSlot(t *testing.T) {
11431128
ctx := context.Background()
11441129
opts := testServiceOptsNoDB()

beacon-chain/blockchain/service_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/protoarray"
2525
"github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations"
2626
"github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p"
27+
state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native"
2728
"github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen"
28-
v1 "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/v1"
2929
"github.com/prysmaticlabs/prysm/v3/config/features"
3030
"github.com/prysmaticlabs/prysm/v3/config/params"
3131
consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks"
@@ -84,7 +84,7 @@ func setupBeaconChain(t *testing.T, beaconDB db.Database) *Service {
8484
srv.Stop()
8585
})
8686
bState, _ := util.DeterministicGenesisState(t, 10)
87-
pbState, err := v1.ProtobufBeaconState(bState.InnerStateUnsafe())
87+
pbState, err := state_native.ProtobufBeaconStatePhase0(bState.InnerStateUnsafe())
8888
require.NoError(t, err)
8989
mockTrie, err := trie.NewTrie(0)
9090
require.NoError(t, err)
@@ -509,7 +509,7 @@ func BenchmarkHasBlockForkChoiceStore_ProtoArray(b *testing.B) {
509509
r, err := blk.Block.HashTreeRoot()
510510
require.NoError(b, err)
511511
bs := &ethpb.BeaconState{FinalizedCheckpoint: &ethpb.Checkpoint{Root: make([]byte, 32)}, CurrentJustifiedCheckpoint: &ethpb.Checkpoint{Root: make([]byte, 32)}}
512-
beaconState, err := v1.InitializeFromProto(bs)
512+
beaconState, err := state_native.InitializeFromProtoPhase0(bs)
513513
require.NoError(b, err)
514514
wsb, err := consensusblocks.NewSignedBeaconBlock(blk)
515515
require.NoError(b, err)
@@ -530,7 +530,7 @@ func BenchmarkHasBlockForkChoiceStore_DoublyLinkedTree(b *testing.B) {
530530
r, err := blk.Block.HashTreeRoot()
531531
require.NoError(b, err)
532532
bs := &ethpb.BeaconState{FinalizedCheckpoint: &ethpb.Checkpoint{Root: make([]byte, 32)}, CurrentJustifiedCheckpoint: &ethpb.Checkpoint{Root: make([]byte, 32)}}
533-
beaconState, err := v1.InitializeFromProto(bs)
533+
beaconState, err := state_native.InitializeFromProtoPhase0(bs)
534534
require.NoError(b, err)
535535
wsb, err := consensusblocks.NewSignedBeaconBlock(blk)
536536
require.NoError(b, err)

beacon-chain/blockchain/state_balance_cache_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88

99
"github.com/prysmaticlabs/prysm/v3/beacon-chain/state"
10-
v2 "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/v2"
10+
state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native"
1111
types "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives"
1212
"github.com/prysmaticlabs/prysm/v3/encoding/bytesutil"
1313
ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1"
@@ -34,7 +34,7 @@ func testStateFixture(opts ...testStateOpt) state.BeaconState {
3434
for _, o := range opts {
3535
o(a)
3636
}
37-
s, _ := v2.InitializeFromProtoUnsafe(a)
37+
s, _ := state_native.InitializeFromProtoUnsafeAltair(a)
3838
return s
3939
}
4040

beacon-chain/cache/BUILD.bazel

+1-3
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ go_test(
7373
embed = [":go_default_library"],
7474
deps = [
7575
"//beacon-chain/state:go_default_library",
76-
"//beacon-chain/state/v1:go_default_library",
77-
"//beacon-chain/state/v2:go_default_library",
78-
"//beacon-chain/state/v3:go_default_library",
76+
"//beacon-chain/state/state-native:go_default_library",
7977
"//config/fieldparams:go_default_library",
8078
"//config/params:go_default_library",
8179
"//consensus-types/primitives:go_default_library",

beacon-chain/cache/active_balance_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"math"
88
"testing"
99

10-
state "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/v1"
10+
state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native"
1111
"github.com/prysmaticlabs/prysm/v3/config/params"
1212
types "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives"
1313
ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1"
@@ -24,7 +24,7 @@ func TestBalanceCache_AddGetBalance(t *testing.T) {
2424
raw := &ethpb.BeaconState{
2525
BlockRoots: blockRoots,
2626
}
27-
st, err := state.InitializeFromProto(raw)
27+
st, err := state_native.InitializeFromProtoPhase0(raw)
2828
require.NoError(t, err)
2929

3030
cache := NewEffectiveBalanceCache()
@@ -68,7 +68,7 @@ func TestBalanceCache_BalanceKey(t *testing.T) {
6868
raw := &ethpb.BeaconState{
6969
BlockRoots: blockRoots,
7070
}
71-
st, err := state.InitializeFromProto(raw)
71+
st, err := state_native.InitializeFromProtoPhase0(raw)
7272
require.NoError(t, err)
7373
require.NoError(t, st.SetSlot(types.Slot(math.MaxUint64)))
7474

beacon-chain/cache/checkpoint_state_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"testing"
55

66
"github.com/prysmaticlabs/prysm/v3/beacon-chain/state"
7-
v1 "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/v1"
7+
state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native"
88
"github.com/prysmaticlabs/prysm/v3/config/params"
99
types "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives"
1010
"github.com/prysmaticlabs/prysm/v3/encoding/bytesutil"
@@ -18,7 +18,7 @@ func TestCheckpointStateCache_StateByCheckpoint(t *testing.T) {
1818
cache := NewCheckpointStateCache()
1919

2020
cp1 := &ethpb.Checkpoint{Epoch: 1, Root: bytesutil.PadTo([]byte{'A'}, 32)}
21-
st, err := v1.InitializeFromProto(&ethpb.BeaconState{
21+
st, err := state_native.InitializeFromProtoPhase0(&ethpb.BeaconState{
2222
GenesisValidatorsRoot: params.BeaconConfig().ZeroHash[:],
2323
Slot: 64,
2424
})
@@ -33,16 +33,16 @@ func TestCheckpointStateCache_StateByCheckpoint(t *testing.T) {
3333
s, err = cache.StateByCheckpoint(cp1)
3434
require.NoError(t, err)
3535

36-
pbState1, err := v1.ProtobufBeaconState(s.InnerStateUnsafe())
36+
pbState1, err := state_native.ProtobufBeaconStatePhase0(s.InnerStateUnsafe())
3737
require.NoError(t, err)
38-
pbstate, err := v1.ProtobufBeaconState(st.InnerStateUnsafe())
38+
pbstate, err := state_native.ProtobufBeaconStatePhase0(st.InnerStateUnsafe())
3939
require.NoError(t, err)
4040
if !proto.Equal(pbState1, pbstate) {
4141
t.Error("incorrectly cached state")
4242
}
4343

4444
cp2 := &ethpb.Checkpoint{Epoch: 2, Root: bytesutil.PadTo([]byte{'B'}, 32)}
45-
st2, err := v1.InitializeFromProto(&ethpb.BeaconState{
45+
st2, err := state_native.InitializeFromProtoPhase0(&ethpb.BeaconState{
4646
Slot: 128,
4747
})
4848
require.NoError(t, err)
@@ -59,7 +59,7 @@ func TestCheckpointStateCache_StateByCheckpoint(t *testing.T) {
5959

6060
func TestCheckpointStateCache_MaxSize(t *testing.T) {
6161
c := NewCheckpointStateCache()
62-
st, err := v1.InitializeFromProto(&ethpb.BeaconState{
62+
st, err := state_native.InitializeFromProtoPhase0(&ethpb.BeaconState{
6363
Slot: 0,
6464
})
6565
require.NoError(t, err)

beacon-chain/cache/skip_slot_cache_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/prysmaticlabs/prysm/v3/beacon-chain/cache"
88
"github.com/prysmaticlabs/prysm/v3/beacon-chain/state"
9-
v1 "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/v1"
9+
state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native"
1010
ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1"
1111
"github.com/prysmaticlabs/prysm/v3/testing/assert"
1212
"github.com/prysmaticlabs/prysm/v3/testing/require"
@@ -23,7 +23,7 @@ func TestSkipSlotCache_RoundTrip(t *testing.T) {
2323

2424
require.NoError(t, c.MarkInProgress(r))
2525

26-
s, err = v1.InitializeFromProto(&ethpb.BeaconState{
26+
s, err = state_native.InitializeFromProtoPhase0(&ethpb.BeaconState{
2727
Slot: 10,
2828
})
2929
require.NoError(t, err)

beacon-chain/cache/sync_committee_head_state_test.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,29 @@ import (
44
"testing"
55

66
"github.com/prysmaticlabs/prysm/v3/beacon-chain/state"
7-
v1 "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/v1"
8-
v2 "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/v2"
9-
v3 "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/v3"
7+
state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native"
108
"github.com/prysmaticlabs/prysm/v3/config/params"
119
types "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives"
1210
ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1"
1311
"github.com/prysmaticlabs/prysm/v3/testing/require"
1412
)
1513

1614
func TestSyncCommitteeHeadState(t *testing.T) {
17-
beaconState, err := v2.InitializeFromProto(&ethpb.BeaconStateAltair{
15+
beaconState, err := state_native.InitializeFromProtoAltair(&ethpb.BeaconStateAltair{
1816
Fork: &ethpb.Fork{
1917
PreviousVersion: params.BeaconConfig().GenesisForkVersion,
2018
CurrentVersion: params.BeaconConfig().GenesisForkVersion,
2119
},
2220
})
2321
require.NoError(t, err)
24-
phase0State, err := v1.InitializeFromProto(&ethpb.BeaconState{
22+
phase0State, err := state_native.InitializeFromProtoPhase0(&ethpb.BeaconState{
2523
Fork: &ethpb.Fork{
2624
PreviousVersion: params.BeaconConfig().GenesisForkVersion,
2725
CurrentVersion: params.BeaconConfig().GenesisForkVersion,
2826
},
2927
})
3028
require.NoError(t, err)
31-
bellatrixState, err := v3.InitializeFromProto(&ethpb.BeaconStateBellatrix{
29+
bellatrixState, err := state_native.InitializeFromProtoBellatrix(&ethpb.BeaconStateBellatrix{
3230
Fork: &ethpb.Fork{
3331
PreviousVersion: params.BeaconConfig().GenesisForkVersion,
3432
CurrentVersion: params.BeaconConfig().GenesisForkVersion,

beacon-chain/core/altair/BUILD.bazel

+2-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ go_library(
3030
"//beacon-chain/core/time:go_default_library",
3131
"//beacon-chain/p2p/types:go_default_library",
3232
"//beacon-chain/state:go_default_library",
33-
"//beacon-chain/state/v2:go_default_library",
33+
"//beacon-chain/state/state-native:go_default_library",
3434
"//config/fieldparams:go_default_library",
3535
"//config/params:go_default_library",
3636
"//consensus-types/blocks:go_default_library",
@@ -72,8 +72,7 @@ go_test(
7272
"//beacon-chain/core/time:go_default_library",
7373
"//beacon-chain/p2p/types:go_default_library",
7474
"//beacon-chain/state:go_default_library",
75-
"//beacon-chain/state/v2:go_default_library",
76-
"//beacon-chain/state/v3:go_default_library",
75+
"//beacon-chain/state/state-native:go_default_library",
7776
"//config/fieldparams:go_default_library",
7877
"//config/params:go_default_library",
7978
"//consensus-types/blocks:go_default_library",

beacon-chain/core/altair/attestation_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing"
1313
"github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time"
1414
"github.com/prysmaticlabs/prysm/v3/beacon-chain/state"
15-
stateAltair "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/v2"
15+
state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native"
1616
fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams"
1717
"github.com/prysmaticlabs/prysm/v3/config/params"
1818
"github.com/prysmaticlabs/prysm/v3/consensus-types/blocks"
@@ -419,7 +419,7 @@ func TestFuzzProcessAttestationsNoVerify_10000(t *testing.T) {
419419
if b.Block == nil {
420420
b.Block = &ethpb.BeaconBlockAltair{}
421421
}
422-
s, err := stateAltair.InitializeFromProtoUnsafe(st)
422+
s, err := state_native.InitializeFromProtoUnsafeAltair(st)
423423
require.NoError(t, err)
424424
if b.Block == nil || b.Block.Body == nil {
425425
continue

beacon-chain/core/altair/deposit_fuzz_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
fuzz "github.com/google/gofuzz"
88
"github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair"
9-
stateAltair "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/v2"
9+
state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native"
1010
ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1"
1111
"github.com/prysmaticlabs/prysm/v3/testing/require"
1212
)
@@ -21,7 +21,7 @@ func TestFuzzProcessDeposits_10000(t *testing.T) {
2121
for i := range deposits {
2222
fuzzer.Fuzz(deposits[i])
2323
}
24-
s, err := stateAltair.InitializeFromProtoUnsafe(state)
24+
s, err := state_native.InitializeFromProtoUnsafeAltair(state)
2525
require.NoError(t, err)
2626
r, err := altair.ProcessDeposits(ctx, s, deposits)
2727
if err != nil && r != nil {
@@ -38,7 +38,7 @@ func TestFuzzProcessDeposit_10000(t *testing.T) {
3838
for i := 0; i < 10000; i++ {
3939
fuzzer.Fuzz(state)
4040
fuzzer.Fuzz(deposit)
41-
s, err := stateAltair.InitializeFromProtoUnsafe(state)
41+
s, err := state_native.InitializeFromProtoUnsafeAltair(state)
4242
require.NoError(t, err)
4343
r, err := altair.ProcessDeposit(s, deposit, true)
4444
if err != nil && r != nil {

0 commit comments

Comments
 (0)