use cmp.Compare, and test ForkSortFunc

common/chain/forks/forks.go

@@ -107,7 +107,7 @@ func (f Fork) String() string {
 // ForkSortFunc is used with slices.SortFunc or slices.SortStableFunc to sort a
 // []*Fork in ascending order by height.
 func ForkSortFunc(a, b *Fork) int {
-	return int(a.Height) - int(b.Height)
+	return cmp.Compare(a.Height, b.Height) // int(a.Height) - int(b.Height)
 }
 
 // matchForks is the primary helper method for returning for names and

common/chain/forks/forks_test.go

@@ -218,3 +218,70 @@ func TestForks_sort(t *testing.T) {
 	slices.SortStableFunc(activeForks, forks.ForkSortFunc)
 	assert.Equal(t, activeForks, wantSorted)
 }
+
+func TestForkSortFunc(t *testing.T) {
+	tests := []struct {
+		name     string
+		forks    []*forks.Fork
+		expected []*forks.Fork
+	}{
+		{
+			name:     "empty",
+			forks:    []*forks.Fork{},
+			expected: []*forks.Fork{},
+		},
+		{
+			name:     "single",
+			forks:    []*forks.Fork{{Name: "a", Height: 1}},
+			expected: []*forks.Fork{{Name: "a", Height: 1}},
+		},
+		{
+			name: "sorted",
+			forks: []*forks.Fork{
+				{Name: "a", Height: 1},
+				{Name: "b", Height: 2},
+				{Name: "c", Height: 3},
+			},
+			expected: []*forks.Fork{
+				{Name: "a", Height: 1},
+				{Name: "b", Height: 2},
+				{Name: "c", Height: 3},
+			},
+		},
+		{
+			name: "unsorted",
+			forks: []*forks.Fork{
+				{Name: "c", Height: 3},
+				{Name: "a", Height: 1},
+				{Name: "b", Height: 2},
+			},
+			expected: []*forks.Fork{
+				{Name: "a", Height: 1},
+				{Name: "b", Height: 2},
+				{Name: "c", Height: 3},
+			},
+		},
+		{
+			name: "duplicate heights",
+			forks: []*forks.Fork{
+				{Name: "a", Height: 1},
+				{Name: "b", Height: 2},
+				{Name: "c", Height: 2},
+				{Name: "d", Height: 3},
+			},
+			expected: []*forks.Fork{
+				{Name: "a", Height: 1},
+				{Name: "b", Height: 2},
+				{Name: "c", Height: 2},
+				{Name: "d", Height: 3},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			slices.SortStableFunc(tt.forks, forks.ForkSortFunc)
+			assert.Equal(t, tt.expected, tt.forks)
+		})
+	}
+}