Skip to content
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

Jump to bottom

remove vm.state re-assignment in tests #1739

Merged
merged 2 commits into from
Jul 20, 2023
Merged

remove vm.state re-assignment in tests #1739

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55c9ec1
prevent `vm.state` reassignment in tests
dhrubabasu Jul 20, 2023
9e9fca0
Merge branch 'dev' into dont-reassign-vm-state
dhrubabasu Jul 20, 2023
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
22 changes: 10 additions & 12 deletions vms/platformvm/vm_regression_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ func TestRejectedStateRegressionInvalidValidatorTimestamp(t *testing.T) {
// Force a reload of the state from the database.
vm.Config.Validators = validators.NewManager()
vm.Config.Validators.Add(constants.PrimaryNetworkID, validators.NewSet())
is, err := state.New(
newState, err := state.New(
vm.dbManager.Current().Database,
nil,
prometheus.NewRegistry(),
Expand All @@ -667,17 +667,16 @@ func TestRejectedStateRegressionInvalidValidatorTimestamp(t *testing.T) {
trackChecksum,
)
require.NoError(err)
vm.state = is

// Verify that new validator is now in the current validator set.
{
_, err := vm.state.GetCurrentValidator(constants.PrimaryNetworkID, nodeID)
_, err := newState.GetCurrentValidator(constants.PrimaryNetworkID, nodeID)
require.NoError(err)

_, err = vm.state.GetPendingValidator(constants.PrimaryNetworkID, nodeID)
_, err = newState.GetPendingValidator(constants.PrimaryNetworkID, nodeID)
require.ErrorIs(err, database.ErrNotFound)

currentTimestamp := vm.state.GetTimestamp()
currentTimestamp := newState.GetTimestamp()
require.Equal(newValidatorStartTime.Unix(), currentTimestamp.Unix())
}
}
Expand Down Expand Up @@ -965,7 +964,7 @@ func TestRejectedStateRegressionInvalidValidatorReward(t *testing.T) {
// Force a reload of the state from the database.
vm.Config.Validators = validators.NewManager()
vm.Config.Validators.Add(constants.PrimaryNetworkID, validators.NewSet())
is, err := state.New(
newState, err := state.New(
vm.dbManager.Current().Database,
nil,
prometheus.NewRegistry(),
Expand All @@ -977,26 +976,25 @@ func TestRejectedStateRegressionInvalidValidatorReward(t *testing.T) {
trackChecksum,
)
require.NoError(err)
vm.state = is

// Verify that validators are in the current validator set with the correct
// reward calculated.
{
staker0, err := vm.state.GetCurrentValidator(constants.PrimaryNetworkID, nodeID0)
staker0, err := newState.GetCurrentValidator(constants.PrimaryNetworkID, nodeID0)
require.NoError(err)
require.Equal(uint64(60000000), staker0.PotentialReward)

staker1, err := vm.state.GetCurrentValidator(constants.PrimaryNetworkID, nodeID1)
staker1, err := newState.GetCurrentValidator(constants.PrimaryNetworkID, nodeID1)
require.NoError(err)
require.Equal(uint64(59999999), staker1.PotentialReward)

_, err = vm.state.GetPendingValidator(constants.PrimaryNetworkID, nodeID0)
_, err = newState.GetPendingValidator(constants.PrimaryNetworkID, nodeID0)
require.ErrorIs(err, database.ErrNotFound)

_, err = vm.state.GetPendingValidator(constants.PrimaryNetworkID, nodeID1)
_, err = newState.GetPendingValidator(constants.PrimaryNetworkID, nodeID1)
require.ErrorIs(err, database.ErrNotFound)

currentTimestamp := vm.state.GetTimestamp()
currentTimestamp := newState.GetTimestamp()
require.Equal(newValidatorStartTime1.Unix(), currentTimestamp.Unix())
}
}
Expand Down