Skip to content

Commit d7e7ff5

Browse files
dhrubabasudhrubabasu
authored
vms/avm: Rename states pkg to state (#2381)
1 parent 6e52922 commit d7e7ff5

19 files changed

+140
-140
lines changed

‎scripts/mocks.mockgen.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ github.com/ava-labs/avalanchego/utils/logging=Logger=utils/logging/mock_logger.g
2727
github.com/ava-labs/avalanchego/utils/resource=User=utils/resource/mock_user.go
2828
github.com/ava-labs/avalanchego/vms/avm/block=Block=vms/avm/block/mock_block.go
2929
github.com/ava-labs/avalanchego/vms/avm/metrics=Metrics=vms/avm/metrics/mock_metrics.go
30-
github.com/ava-labs/avalanchego/vms/avm/states=Chain,State,Diff=vms/avm/states/mock_states.go
30+
github.com/ava-labs/avalanchego/vms/avm/state=Chain,State,Diff=vms/avm/state/mock_state.go
3131
github.com/ava-labs/avalanchego/vms/avm/txs/mempool=Mempool=vms/avm/txs/mempool/mock_mempool.go
3232
github.com/ava-labs/avalanchego/vms/components/avax=TransferableIn=vms/components/avax/mock_transferable_in.go
3333
github.com/ava-labs/avalanchego/vms/components/verify=Verifiable=vms/components/verify/mock_verifiable.go

‎vms/avm/block/builder/builder.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/ava-labs/avalanchego/utils/timer/mockable"
1414
"github.com/ava-labs/avalanchego/utils/units"
1515
"github.com/ava-labs/avalanchego/vms/avm/block"
16-
"github.com/ava-labs/avalanchego/vms/avm/states"
16+
"github.com/ava-labs/avalanchego/vms/avm/state"
1717
"github.com/ava-labs/avalanchego/vms/avm/txs"
1818
"github.com/ava-labs/avalanchego/vms/avm/txs/mempool"
1919

@@ -82,7 +82,7 @@ func (b *builder) BuildBlock(context.Context) (snowman.Block, error) {
8282
nextTimestamp = preferredTimestamp
8383
}
8484

85-
stateDiff, err := states.NewDiff(preferredID, b.manager)
85+
stateDiff, err := state.NewDiff(preferredID, b.manager)
8686
if err != nil {
8787
return nil, err
8888
}
@@ -168,15 +168,15 @@ func (b *builder) BuildBlock(context.Context) (snowman.Block, error) {
168168
}
169169

170170
type stateGetter struct {
171-
state states.Chain
171+
state state.Chain
172172
}
173173

174-
func (s stateGetter) GetState(ids.ID) (states.Chain, bool) {
174+
func (s stateGetter) GetState(ids.ID) (state.Chain, bool) {
175175
return s.state, true
176176
}
177177

178-
func wrapState(parentState states.Chain) (states.Diff, error) {
179-
return states.NewDiff(ids.Empty, stateGetter{
178+
func wrapState(parentState state.Chain) (state.Diff, error) {
179+
return state.NewDiff(ids.Empty, stateGetter{
180180
state: parentState,
181181
})
182182
}

‎vms/avm/block/builder/builder_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/ava-labs/avalanchego/vms/avm/block"
3030
"github.com/ava-labs/avalanchego/vms/avm/fxs"
3131
"github.com/ava-labs/avalanchego/vms/avm/metrics"
32-
"github.com/ava-labs/avalanchego/vms/avm/states"
32+
"github.com/ava-labs/avalanchego/vms/avm/state"
3333
"github.com/ava-labs/avalanchego/vms/avm/txs"
3434
"github.com/ava-labs/avalanchego/vms/avm/txs/mempool"
3535
"github.com/ava-labs/avalanchego/vms/components/avax"
@@ -108,7 +108,7 @@ func TestBuilderBuildBlock(t *testing.T) {
108108
mempool,
109109
)
110110
},
111-
expectedErr: states.ErrMissingParentState,
111+
expectedErr: state.ErrMissingParentState,
112112
},
113113
{
114114
name: "tx fails semantic verification",
@@ -120,7 +120,7 @@ func TestBuilderBuildBlock(t *testing.T) {
120120
preferredBlock.EXPECT().Height().Return(preferredHeight)
121121
preferredBlock.EXPECT().Timestamp().Return(preferredTimestamp)
122122

123-
preferredState := states.NewMockChain(ctrl)
123+
preferredState := state.NewMockChain(ctrl)
124124
preferredState.EXPECT().GetLastAccepted().Return(preferredID)
125125
preferredState.EXPECT().GetTimestamp().Return(preferredTimestamp)
126126

@@ -164,7 +164,7 @@ func TestBuilderBuildBlock(t *testing.T) {
164164
preferredBlock.EXPECT().Height().Return(preferredHeight)
165165
preferredBlock.EXPECT().Timestamp().Return(preferredTimestamp)
166166

167-
preferredState := states.NewMockChain(ctrl)
167+
preferredState := state.NewMockChain(ctrl)
168168
preferredState.EXPECT().GetLastAccepted().Return(preferredID)
169169
preferredState.EXPECT().GetTimestamp().Return(preferredTimestamp)
170170

@@ -209,7 +209,7 @@ func TestBuilderBuildBlock(t *testing.T) {
209209
preferredBlock.EXPECT().Height().Return(preferredHeight)
210210
preferredBlock.EXPECT().Timestamp().Return(preferredTimestamp)
211211

212-
preferredState := states.NewMockChain(ctrl)
212+
preferredState := state.NewMockChain(ctrl)
213213
preferredState.EXPECT().GetLastAccepted().Return(preferredID)
214214
preferredState.EXPECT().GetTimestamp().Return(preferredTimestamp)
215215

@@ -255,7 +255,7 @@ func TestBuilderBuildBlock(t *testing.T) {
255255
preferredBlock.EXPECT().Height().Return(preferredHeight)
256256
preferredBlock.EXPECT().Timestamp().Return(preferredTimestamp)
257257

258-
preferredState := states.NewMockChain(ctrl)
258+
preferredState := state.NewMockChain(ctrl)
259259
preferredState.EXPECT().GetLastAccepted().Return(preferredID)
260260
preferredState.EXPECT().GetTimestamp().Return(preferredTimestamp)
261261

@@ -353,7 +353,7 @@ func TestBuilderBuildBlock(t *testing.T) {
353353
clock := &mockable.Clock{}
354354
clock.Set(preferredTimestamp.Add(-2 * time.Second))
355355

356-
preferredState := states.NewMockChain(ctrl)
356+
preferredState := state.NewMockChain(ctrl)
357357
preferredState.EXPECT().GetLastAccepted().Return(preferredID)
358358
preferredState.EXPECT().GetTimestamp().Return(preferredTimestamp)
359359

@@ -427,7 +427,7 @@ func TestBuilderBuildBlock(t *testing.T) {
427427
clock := &mockable.Clock{}
428428
clock.Set(now)
429429

430-
preferredState := states.NewMockChain(ctrl)
430+
preferredState := state.NewMockChain(ctrl)
431431
preferredState.EXPECT().GetLastAccepted().Return(preferredID)
432432
preferredState.EXPECT().GetTimestamp().Return(preferredTimestamp)
433433

@@ -526,7 +526,7 @@ func TestBlockBuilderAddLocalTx(t *testing.T) {
526526

527527
baseDB := versiondb.New(memdb.New())
528528

529-
state, err := states.New(baseDB, parser, registerer, trackChecksums)
529+
state, err := state.New(baseDB, parser, registerer, trackChecksums)
530530
require.NoError(err)
531531

532532
clk := &mockable.Clock{}

‎vms/avm/block/executor/block.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/ava-labs/avalanchego/snow/choices"
1818
"github.com/ava-labs/avalanchego/snow/consensus/snowman"
1919
"github.com/ava-labs/avalanchego/vms/avm/block"
20-
"github.com/ava-labs/avalanchego/vms/avm/states"
20+
"github.com/ava-labs/avalanchego/vms/avm/state"
2121
"github.com/ava-labs/avalanchego/vms/avm/txs/executor"
2222
)
2323

@@ -106,7 +106,7 @@ func (b *Block) Verify(context.Context) error {
106106
)
107107
}
108108

109-
stateDiff, err := states.NewDiff(parentID, b.manager)
109+
stateDiff, err := state.NewDiff(parentID, b.manager)
110110
if err != nil {
111111
return err
112112
}

‎vms/avm/block/executor/block_test.go‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/ava-labs/avalanchego/utils/timer/mockable"
2525
"github.com/ava-labs/avalanchego/vms/avm/block"
2626
"github.com/ava-labs/avalanchego/vms/avm/metrics"
27-
"github.com/ava-labs/avalanchego/vms/avm/states"
27+
"github.com/ava-labs/avalanchego/vms/avm/state"
2828
"github.com/ava-labs/avalanchego/vms/avm/txs"
2929
"github.com/ava-labs/avalanchego/vms/avm/txs/executor"
3030
"github.com/ava-labs/avalanchego/vms/avm/txs/mempool"
@@ -153,7 +153,7 @@ func TestBlockVerify(t *testing.T) {
153153
parentID := ids.GenerateTestID()
154154
mockBlock.EXPECT().Parent().Return(parentID).AnyTimes()
155155

156-
mockState := states.NewMockState(ctrl)
156+
mockState := state.NewMockState(ctrl)
157157
mockState.EXPECT().GetBlock(parentID).Return(nil, errTest)
158158
return &Block{
159159
Block: mockBlock,
@@ -186,7 +186,7 @@ func TestBlockVerify(t *testing.T) {
186186
parentID := ids.GenerateTestID()
187187
mockBlock.EXPECT().Parent().Return(parentID).AnyTimes()
188188

189-
mockState := states.NewMockState(ctrl)
189+
mockState := state.NewMockState(ctrl)
190190
mockParentBlock := block.NewMockBlock(ctrl)
191191
mockParentBlock.EXPECT().Height().Return(blockHeight) // Should be blockHeight - 1
192192
mockState.EXPECT().GetBlock(parentID).Return(mockParentBlock, nil)
@@ -226,7 +226,7 @@ func TestBlockVerify(t *testing.T) {
226226
mockParentBlock := block.NewMockBlock(ctrl)
227227
mockParentBlock.EXPECT().Height().Return(blockHeight - 1)
228228

229-
mockParentState := states.NewMockDiff(ctrl)
229+
mockParentState := state.NewMockDiff(ctrl)
230230
mockParentState.EXPECT().GetLastAccepted().Return(parentID)
231231
mockParentState.EXPECT().GetTimestamp().Return(blockTimestamp.Add(1))
232232

@@ -271,7 +271,7 @@ func TestBlockVerify(t *testing.T) {
271271
mockParentBlock := block.NewMockBlock(ctrl)
272272
mockParentBlock.EXPECT().Height().Return(blockHeight - 1)
273273

274-
mockParentState := states.NewMockDiff(ctrl)
274+
mockParentState := state.NewMockDiff(ctrl)
275275
mockParentState.EXPECT().GetLastAccepted().Return(parentID)
276276
mockParentState.EXPECT().GetTimestamp().Return(blockTimestamp)
277277

@@ -321,7 +321,7 @@ func TestBlockVerify(t *testing.T) {
321321
mockParentBlock := block.NewMockBlock(ctrl)
322322
mockParentBlock.EXPECT().Height().Return(blockHeight - 1)
323323

324-
mockParentState := states.NewMockDiff(ctrl)
324+
mockParentState := state.NewMockDiff(ctrl)
325325
mockParentState.EXPECT().GetLastAccepted().Return(parentID)
326326
mockParentState.EXPECT().GetTimestamp().Return(blockTimestamp)
327327

@@ -399,7 +399,7 @@ func TestBlockVerify(t *testing.T) {
399399
mockParentBlock := block.NewMockBlock(ctrl)
400400
mockParentBlock.EXPECT().Height().Return(blockHeight - 1)
401401

402-
mockParentState := states.NewMockDiff(ctrl)
402+
mockParentState := state.NewMockDiff(ctrl)
403403
mockParentState.EXPECT().GetLastAccepted().Return(parentID)
404404
mockParentState.EXPECT().GetTimestamp().Return(blockTimestamp)
405405

@@ -461,7 +461,7 @@ func TestBlockVerify(t *testing.T) {
461461
mockParentBlock := block.NewMockBlock(ctrl)
462462
mockParentBlock.EXPECT().Height().Return(blockHeight - 1)
463463

464-
mockParentState := states.NewMockDiff(ctrl)
464+
mockParentState := state.NewMockDiff(ctrl)
465465
mockParentState.EXPECT().GetLastAccepted().Return(parentID)
466466
mockParentState.EXPECT().GetTimestamp().Return(blockTimestamp)
467467

@@ -509,7 +509,7 @@ func TestBlockVerify(t *testing.T) {
509509
mockParentBlock := block.NewMockBlock(ctrl)
510510
mockParentBlock.EXPECT().Height().Return(blockHeight - 1)
511511

512-
mockParentState := states.NewMockDiff(ctrl)
512+
mockParentState := state.NewMockDiff(ctrl)
513513
mockParentState.EXPECT().GetLastAccepted().Return(parentID)
514514
mockParentState.EXPECT().GetTimestamp().Return(blockTimestamp)
515515

@@ -616,11 +616,11 @@ func TestBlockAccept(t *testing.T) {
616616
mempool := mempool.NewMockMempool(ctrl)
617617
mempool.EXPECT().Remove(gomock.Any()).AnyTimes()
618618

619-
mockManagerState := states.NewMockState(ctrl)
619+
mockManagerState := state.NewMockState(ctrl)
620620
mockManagerState.EXPECT().CommitBatch().Return(nil, errTest)
621621
mockManagerState.EXPECT().Abort()
622622

623-
mockOnAcceptState := states.NewMockDiff(ctrl)
623+
mockOnAcceptState := state.NewMockDiff(ctrl)
624624
mockOnAcceptState.EXPECT().Apply(mockManagerState)
625625

626626
return &Block{
@@ -654,7 +654,7 @@ func TestBlockAccept(t *testing.T) {
654654
mempool := mempool.NewMockMempool(ctrl)
655655
mempool.EXPECT().Remove(gomock.Any()).AnyTimes()
656656

657-
mockManagerState := states.NewMockState(ctrl)
657+
mockManagerState := state.NewMockState(ctrl)
658658
// Note the returned batch is nil but not used
659659
// because we mock the call to shared memory
660660
mockManagerState.EXPECT().CommitBatch().Return(nil, nil)
@@ -663,7 +663,7 @@ func TestBlockAccept(t *testing.T) {
663663
mockSharedMemory := atomic.NewMockSharedMemory(ctrl)
664664
mockSharedMemory.EXPECT().Apply(gomock.Any(), gomock.Any()).Return(errTest)
665665

666-
mockOnAcceptState := states.NewMockDiff(ctrl)
666+
mockOnAcceptState := state.NewMockDiff(ctrl)
667667
mockOnAcceptState.EXPECT().Apply(mockManagerState)
668668

669669
return &Block{
@@ -698,7 +698,7 @@ func TestBlockAccept(t *testing.T) {
698698
mempool := mempool.NewMockMempool(ctrl)
699699
mempool.EXPECT().Remove(gomock.Any()).AnyTimes()
700700

701-
mockManagerState := states.NewMockState(ctrl)
701+
mockManagerState := state.NewMockState(ctrl)
702702
// Note the returned batch is nil but not used
703703
// because we mock the call to shared memory
704704
mockManagerState.EXPECT().CommitBatch().Return(nil, nil)
@@ -707,7 +707,7 @@ func TestBlockAccept(t *testing.T) {
707707
mockSharedMemory := atomic.NewMockSharedMemory(ctrl)
708708
mockSharedMemory.EXPECT().Apply(gomock.Any(), gomock.Any()).Return(nil)
709709

710-
mockOnAcceptState := states.NewMockDiff(ctrl)
710+
mockOnAcceptState := state.NewMockDiff(ctrl)
711711
mockOnAcceptState.EXPECT().Apply(mockManagerState)
712712

713713
metrics := metrics.NewMockMetrics(ctrl)
@@ -748,7 +748,7 @@ func TestBlockAccept(t *testing.T) {
748748
mempool := mempool.NewMockMempool(ctrl)
749749
mempool.EXPECT().Remove(gomock.Any()).AnyTimes()
750750

751-
mockManagerState := states.NewMockState(ctrl)
751+
mockManagerState := state.NewMockState(ctrl)
752752
// Note the returned batch is nil but not used
753753
// because we mock the call to shared memory
754754
mockManagerState.EXPECT().CommitBatch().Return(nil, nil)
@@ -758,7 +758,7 @@ func TestBlockAccept(t *testing.T) {
758758
mockSharedMemory := atomic.NewMockSharedMemory(ctrl)
759759
mockSharedMemory.EXPECT().Apply(gomock.Any(), gomock.Any()).Return(nil)
760760

761-
mockOnAcceptState := states.NewMockDiff(ctrl)
761+
mockOnAcceptState := state.NewMockDiff(ctrl)
762762
mockOnAcceptState.EXPECT().Apply(mockManagerState)
763763

764764
metrics := metrics.NewMockMetrics(ctrl)
@@ -859,7 +859,7 @@ func TestBlockReject(t *testing.T) {
859859
mempool.EXPECT().Add(validTx).Return(nil) // Only add the one that passes verification
860860

861861
preferredID := ids.GenerateTestID()
862-
mockPreferredState := states.NewMockDiff(ctrl)
862+
mockPreferredState := state.NewMockDiff(ctrl)
863863
mockPreferredState.EXPECT().GetLastAccepted().Return(ids.GenerateTestID()).AnyTimes()
864864
mockPreferredState.EXPECT().GetTimestamp().Return(time.Now()).AnyTimes()
865865

@@ -918,7 +918,7 @@ func TestBlockReject(t *testing.T) {
918918
mempool.EXPECT().Add(tx2).Return(nil)
919919

920920
preferredID := ids.GenerateTestID()
921-
mockPreferredState := states.NewMockDiff(ctrl)
921+
mockPreferredState := state.NewMockDiff(ctrl)
922922
mockPreferredState.EXPECT().GetLastAccepted().Return(ids.GenerateTestID()).AnyTimes()
923923
mockPreferredState.EXPECT().GetTimestamp().Return(time.Now()).AnyTimes()
924924

@@ -1014,7 +1014,7 @@ func TestBlockStatus(t *testing.T) {
10141014
mockBlock := block.NewMockBlock(ctrl)
10151015
mockBlock.EXPECT().ID().Return(blockID).AnyTimes()
10161016

1017-
mockState := states.NewMockState(ctrl)
1017+
mockState := state.NewMockState(ctrl)
10181018
mockState.EXPECT().GetBlock(blockID).Return(nil, nil)
10191019

10201020
return &Block{
@@ -1034,7 +1034,7 @@ func TestBlockStatus(t *testing.T) {
10341034
mockBlock := block.NewMockBlock(ctrl)
10351035
mockBlock.EXPECT().ID().Return(blockID).AnyTimes()
10361036

1037-
mockState := states.NewMockState(ctrl)
1037+
mockState := state.NewMockState(ctrl)
10381038
mockState.EXPECT().GetBlock(blockID).Return(nil, database.ErrNotFound)
10391039

10401040
return &Block{

‎vms/avm/block/executor/manager.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/ava-labs/avalanchego/utils/timer/mockable"
1414
"github.com/ava-labs/avalanchego/vms/avm/block"
1515
"github.com/ava-labs/avalanchego/vms/avm/metrics"
16-
"github.com/ava-labs/avalanchego/vms/avm/states"
16+
"github.com/ava-labs/avalanchego/vms/avm/state"
1717
"github.com/ava-labs/avalanchego/vms/avm/txs"
1818
"github.com/ava-labs/avalanchego/vms/avm/txs/executor"
1919
"github.com/ava-labs/avalanchego/vms/avm/txs/mempool"
@@ -27,7 +27,7 @@ var (
2727
)
2828

2929
type Manager interface {
30-
states.Versions
30+
state.Versions
3131

3232
// Returns the ID of the most recently accepted block.
3333
LastAccepted() ids.ID
@@ -51,7 +51,7 @@ type Manager interface {
5151
func NewManager(
5252
mempool mempool.Mempool,
5353
metrics metrics.Metrics,
54-
state states.State,
54+
state state.State,
5555
backend *executor.Backend,
5656
clk *mockable.Clock,
5757
onAccept func(*txs.Tx) error,
@@ -72,7 +72,7 @@ func NewManager(
7272

7373
type manager struct {
7474
backend *executor.Backend
75-
state states.State
75+
state state.State
7676
metrics metrics.Metrics
7777
mempool mempool.Mempool
7878
clk *mockable.Clock
@@ -93,12 +93,12 @@ type manager struct {
9393

9494
type blockState struct {
9595
statelessBlock block.Block
96-
onAcceptState states.Diff
96+
onAcceptState state.Diff
9797
importedInputs set.Set[ids.ID]
9898
atomicRequests map[ids.ID]*atomic.Requests
9999
}
100100

101-
func (m *manager) GetState(blkID ids.ID) (states.Chain, bool) {
101+
func (m *manager) GetState(blkID ids.ID) (state.Chain, bool) {
102102
// If the block is in the map, it is processing.
103103
if state, ok := m.blkIDToState[blkID]; ok {
104104
return state.onAcceptState, true
@@ -155,7 +155,7 @@ func (m *manager) VerifyTx(tx *txs.Tx) error {
155155
return err
156156
}
157157

158-
stateDiff, err := states.NewDiff(m.preferred, m)
158+
stateDiff, err := state.NewDiff(m.preferred, m)
159159
if err != nil {
160160
return err
161161
}

0 commit comments

Comments
 (0)