Skip to content

Remove mocked iterator #3417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 25, 2024
Merged

Remove mocked iterator #3417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion scripts/mocks.mockgen.source.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
snow/engine/common/sender.go=StateSummarySender,AcceptedStateSummarySender,FrontierSender,AcceptedSender,FetchSender,AppSender,QuerySender,Gossiper=Sender=snow/engine/common/commonmock/sender.go
snow/networking/router/router.go=InternalHandler=Router=snow/networking/router/routermock/router.go
snow/networking/sender/external_sender.go==ExternalSender=snow/networking/sender/sendermock/external_sender.go
utils/iterator/iterator.go==Iterator=utils/iterator/iteratormock/iterator.go
vms/avm/block/block.go==MockBlock=vms/avm/block/mock_block.go
vms/avm/block/executor/manager.go==Manager=vms/avm/block/executor/executormock/manager.go
vms/avm/txs/tx.go==UnsignedTx=vms/avm/txs/txsmock/tx.go
Expand Down
79 changes: 0 additions & 79 deletions utils/iterator/iteratormock/iterator.go
View file
Open in desktop

This file was deleted.

146 changes: 64 additions & 82 deletions vms/platformvm/block/builder/builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/ava-labs/avalanchego/upgrade/upgradetest"
"github.com/ava-labs/avalanchego/utils/constants"
"github.com/ava-labs/avalanchego/utils/crypto/bls"
"github.com/ava-labs/avalanchego/utils/iterator/iteratormock"
"github.com/ava-labs/avalanchego/utils/iterator"
"github.com/ava-labs/avalanchego/utils/timer/mockable"
"github.com/ava-labs/avalanchego/utils/units"
"github.com/ava-labs/avalanchego/vms/platformvm/block"
Expand Down Expand Up @@ -487,38 +487,30 @@ func TestGetNextStakerToReward(t *testing.T) {
name: "no stakers",
timestamp: now,
stateF: func(ctrl *gomock.Controller) state.Chain {
currentStakerIter := iteratormock.NewIterator[*state.Staker](ctrl)
currentStakerIter.EXPECT().Next().Return(false)
currentStakerIter.EXPECT().Release()

s := state.NewMockChain(ctrl)
s.EXPECT().GetCurrentStakerIterator().Return(currentStakerIter, nil)

s.EXPECT().GetCurrentStakerIterator().Return(iterator.Empty[*state.Staker]{}, nil)
return s
},
},
{
name: "expired subnet validator/delegator",
timestamp: now,
stateF: func(ctrl *gomock.Controller) state.Chain {
currentStakerIter := iteratormock.NewIterator[*state.Staker](ctrl)

currentStakerIter.EXPECT().Next().Return(true)
currentStakerIter.EXPECT().Value().Return(&state.Staker{
Priority: txs.SubnetPermissionedValidatorCurrentPriority,
EndTime: now,
})
currentStakerIter.EXPECT().Next().Return(true)
currentStakerIter.EXPECT().Value().Return(&state.Staker{
TxID: txID,
Priority: txs.SubnetPermissionlessDelegatorCurrentPriority,
EndTime: now,
})
currentStakerIter.EXPECT().Release()

s := state.NewMockChain(ctrl)
s.EXPECT().GetCurrentStakerIterator().Return(currentStakerIter, nil)

s.EXPECT().GetCurrentStakerIterator().Return(
iterator.FromSlice(
&state.Staker{
Priority: txs.SubnetPermissionedValidatorCurrentPriority,
EndTime: now,
},
&state.Staker{
TxID: txID,
Priority: txs.SubnetPermissionlessDelegatorCurrentPriority,
EndTime: now,
},
),
nil,
)
return s
},
expectedTxID: txID,
Expand All @@ -528,24 +520,21 @@ func TestGetNextStakerToReward(t *testing.T) {
name: "expired primary network validator after subnet expired subnet validator",
timestamp: now,
stateF: func(ctrl *gomock.Controller) state.Chain {
currentStakerIter := iteratormock.NewIterator[*state.Staker](ctrl)

currentStakerIter.EXPECT().Next().Return(true)
currentStakerIter.EXPECT().Value().Return(&state.Staker{
Priority: txs.SubnetPermissionedValidatorCurrentPriority,
EndTime: now,
})
currentStakerIter.EXPECT().Next().Return(true)
currentStakerIter.EXPECT().Value().Return(&state.Staker{
TxID: txID,
Priority: txs.PrimaryNetworkValidatorCurrentPriority,
EndTime: now,
})
currentStakerIter.EXPECT().Release()

s := state.NewMockChain(ctrl)
s.EXPECT().GetCurrentStakerIterator().Return(currentStakerIter, nil)

s.EXPECT().GetCurrentStakerIterator().Return(
iterator.FromSlice(
&state.Staker{
Priority: txs.SubnetPermissionedValidatorCurrentPriority,
EndTime: now,
},
&state.Staker{
TxID: txID,
Priority: txs.PrimaryNetworkValidatorCurrentPriority,
EndTime: now,
},
),
nil,
)
return s
},
expectedTxID: txID,
Expand All @@ -555,24 +544,21 @@ func TestGetNextStakerToReward(t *testing.T) {
name: "expired primary network delegator after subnet expired subnet validator",
timestamp: now,
stateF: func(ctrl *gomock.Controller) state.Chain {
currentStakerIter := iteratormock.NewIterator[*state.Staker](ctrl)

currentStakerIter.EXPECT().Next().Return(true)
currentStakerIter.EXPECT().Value().Return(&state.Staker{
Priority: txs.SubnetPermissionedValidatorCurrentPriority,
EndTime: now,
})
currentStakerIter.EXPECT().Next().Return(true)
currentStakerIter.EXPECT().Value().Return(&state.Staker{
TxID: txID,
Priority: txs.PrimaryNetworkDelegatorCurrentPriority,
EndTime: now,
})
currentStakerIter.EXPECT().Release()

s := state.NewMockChain(ctrl)
s.EXPECT().GetCurrentStakerIterator().Return(currentStakerIter, nil)

s.EXPECT().GetCurrentStakerIterator().Return(
iterator.FromSlice(
&state.Staker{
Priority: txs.SubnetPermissionedValidatorCurrentPriority,
EndTime: now,
},
&state.Staker{
TxID: txID,
Priority: txs.PrimaryNetworkDelegatorCurrentPriority,
EndTime: now,
},
),
nil,
)
return s
},
expectedTxID: txID,
Expand All @@ -582,19 +568,17 @@ func TestGetNextStakerToReward(t *testing.T) {
name: "non-expired primary network delegator",
timestamp: now,
stateF: func(ctrl *gomock.Controller) state.Chain {
currentStakerIter := iteratormock.NewIterator[*state.Staker](ctrl)

currentStakerIter.EXPECT().Next().Return(true)
currentStakerIter.EXPECT().Value().Return(&state.Staker{
TxID: txID,
Priority: txs.PrimaryNetworkDelegatorCurrentPriority,
EndTime: now.Add(time.Second),
})
currentStakerIter.EXPECT().Release()

s := state.NewMockChain(ctrl)
s.EXPECT().GetCurrentStakerIterator().Return(currentStakerIter, nil)

s.EXPECT().GetCurrentStakerIterator().Return(
iterator.FromSlice(
&state.Staker{
TxID: txID,
Priority: txs.PrimaryNetworkDelegatorCurrentPriority,
EndTime: now.Add(time.Second),
},
),
nil,
)
return s
},
expectedTxID: txID,
Expand All @@ -604,19 +588,17 @@ func TestGetNextStakerToReward(t *testing.T) {
name: "non-expired primary network validator",
timestamp: now,
stateF: func(ctrl *gomock.Controller) state.Chain {
currentStakerIter := iteratormock.NewIterator[*state.Staker](ctrl)

currentStakerIter.EXPECT().Next().Return(true)
currentStakerIter.EXPECT().Value().Return(&state.Staker{
TxID: txID,
Priority: txs.PrimaryNetworkValidatorCurrentPriority,
EndTime: now.Add(time.Second),
})
currentStakerIter.EXPECT().Release()

s := state.NewMockChain(ctrl)
s.EXPECT().GetCurrentStakerIterator().Return(currentStakerIter, nil)

s.EXPECT().GetCurrentStakerIterator().Return(
iterator.FromSlice(
&state.Staker{
TxID: txID,
Priority: txs.PrimaryNetworkValidatorCurrentPriority,
EndTime: now.Add(time.Second),
},
),
nil,
)
return s
},
expectedTxID: txID,
Expand Down
24 changes: 11 additions & 13 deletions vms/platformvm/block/executor/proposal_block_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"github.com/ava-labs/avalanchego/utils/crypto/bls"
"github.com/ava-labs/avalanchego/utils/crypto/secp256k1"
"github.com/ava-labs/avalanchego/utils/iterator"
"github.com/ava-labs/avalanchego/utils/iterator/iteratormock"
"github.com/ava-labs/avalanchego/utils/timer/mockable"
"github.com/ava-labs/avalanchego/vms/components/avax"
"github.com/ava-labs/avalanchego/vms/components/gas"
Expand Down Expand Up @@ -94,18 +93,17 @@ func TestApricotProposalBlockTimeVerification(t *testing.T) {
onParentAccept.EXPECT().GetFeeState().Return(gas.State{}).AnyTimes()
onParentAccept.EXPECT().GetAccruedFees().Return(uint64(0)).AnyTimes()

currentStakersIt := iteratormock.NewIterator[*state.Staker](ctrl)
currentStakersIt.EXPECT().Next().Return(true)
currentStakersIt.EXPECT().Value().Return(&state.Staker{
TxID: addValTx.ID(),
NodeID: utx.NodeID(),
SubnetID: utx.SubnetID(),
StartTime: utx.StartTime(),
NextTime: chainTime,
EndTime: chainTime,
}).Times(2)
currentStakersIt.EXPECT().Release()
onParentAccept.EXPECT().GetCurrentStakerIterator().Return(currentStakersIt, nil)
onParentAccept.EXPECT().GetCurrentStakerIterator().Return(
iterator.FromSlice(&state.Staker{
TxID: addValTx.ID(),
NodeID: utx.NodeID(),
SubnetID: utx.SubnetID(),
StartTime: utx.StartTime(),
NextTime: chainTime,
EndTime: chainTime,
}),
nil,
)
onParentAccept.EXPECT().GetTx(addValTx.ID()).Return(addValTx, status.Committed, nil)
onParentAccept.EXPECT().GetCurrentSupply(constants.PrimaryNetworkID).Return(uint64(1000), nil).AnyTimes()
onParentAccept.EXPECT().GetDelegateeReward(constants.PrimaryNetworkID, utx.NodeID()).Return(uint64(0), nil).AnyTimes()
Expand Down
11 changes: 2 additions & 9 deletions vms/platformvm/state/diff_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"github.com/ava-labs/avalanchego/utils"
"github.com/ava-labs/avalanchego/utils/constants"
"github.com/ava-labs/avalanchego/utils/iterator"
"github.com/ava-labs/avalanchego/utils/iterator/iteratormock"
"github.com/ava-labs/avalanchego/utils/set"
"github.com/ava-labs/avalanchego/vms/components/avax"
"github.com/ava-labs/avalanchego/vms/components/gas"
Expand Down Expand Up @@ -357,13 +356,10 @@ func TestDiffCurrentDelegator(t *testing.T) {

// Assert that we get the current delegator back
// Mock iterator for [state] returns no delegators.
stateCurrentDelegatorIter := iteratormock.NewIterator[*Staker](ctrl)
stateCurrentDelegatorIter.EXPECT().Next().Return(false).Times(2)
stateCurrentDelegatorIter.EXPECT().Release().Times(2)
state.EXPECT().GetCurrentDelegatorIterator(
currentDelegator.SubnetID,
currentDelegator.NodeID,
).Return(stateCurrentDelegatorIter, nil).Times(2)
).Return(iterator.Empty[*Staker]{}, nil).Times(2)
gotCurrentDelegatorIter, err := d.GetCurrentDelegatorIterator(currentDelegator.SubnetID, currentDelegator.NodeID)
require.NoError(err)
// The iterator should have the 1 delegator we put in [d]
Expand Down Expand Up @@ -404,13 +400,10 @@ func TestDiffPendingDelegator(t *testing.T) {

// Assert that we get the pending delegator back
// Mock iterator for [state] returns no delegators.
statePendingDelegatorIter := iteratormock.NewIterator[*Staker](ctrl)
statePendingDelegatorIter.EXPECT().Next().Return(false).Times(2)
statePendingDelegatorIter.EXPECT().Release().Times(2)
state.EXPECT().GetPendingDelegatorIterator(
pendingDelegator.SubnetID,
pendingDelegator.NodeID,
).Return(statePendingDelegatorIter, nil).Times(2)
).Return(iterator.Empty[*Staker]{}, nil).Times(2)
gotPendingDelegatorIter, err := d.GetPendingDelegatorIterator(pendingDelegator.SubnetID, pendingDelegator.NodeID)
require.NoError(err)
// The iterator should have the 1 delegator we put in [d]
Expand Down
Loading