Skip to content

Commit 21b7ab8

Browse files
Fix platformvm.SetPreference (#2429)
1 parent ada692a commit 21b7ab8

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

vms/platformvm/block/builder/builder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func TestNoErrorOnUnexpectedSetPreferenceDuringBootstrapping(t *testing.T) {
132132
require.NoError(shutdownEnvironment(env))
133133
}()
134134

135-
require.False(env.blkManager.SetPreference(ids.GenerateTestID())) // should not panic
135+
require.True(env.blkManager.SetPreference(ids.GenerateTestID())) // should not panic
136136
}
137137

138138
func TestGetNextStakerToReward(t *testing.T) {

vms/platformvm/block/executor/manager.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ func (m *manager) NewBlock(blk block.Block) snowman.Block {
107107
}
108108
}
109109

110-
func (m *manager) SetPreference(blockID ids.ID) (updated bool) {
111-
updated = m.preferred == blockID
112-
m.preferred = blockID
110+
func (m *manager) SetPreference(blkID ids.ID) bool {
111+
updated := m.preferred != blkID
112+
m.preferred = blkID
113113
return updated
114114
}
115115

vms/platformvm/block/executor/manager_test.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,18 @@ func TestManagerLastAccepted(t *testing.T) {
7272

7373
require.Equal(t, lastAcceptedID, manager.LastAccepted())
7474
}
75+
76+
func TestManagerSetPreference(t *testing.T) {
77+
require := require.New(t)
78+
79+
initialPreference := ids.GenerateTestID()
80+
manager := &manager{
81+
preferred: initialPreference,
82+
}
83+
require.False(manager.SetPreference(initialPreference))
84+
85+
newPreference := ids.GenerateTestID()
86+
require.True(manager.SetPreference(newPreference))
87+
require.False(manager.SetPreference(newPreference))
88+
require.True(manager.SetPreference(initialPreference))
89+
}

0 commit comments

Comments
 (0)