all: use cmp.Compare (#30958)

cmd/devp2p/dns_route53.go

@@ -17,6 +17,7 @@
 package main
 
 import (
+	"cmp"
 	"context"
 	"errors"
 	"fmt"
@@ -292,13 +293,7 @@ func sortChanges(changes []types.Change) {
 		if a.Action == b.Action {
 			return strings.Compare(*a.ResourceRecordSet.Name, *b.ResourceRecordSet.Name)
 		}
-		if score[string(a.Action)] < score[string(b.Action)] {
+		return cmp.Compare(score[string(a.Action)], score[string(b.Action)])
-			return -1
-		}
-		if score[string(a.Action)] > score[string(b.Action)] {
-			return 1
-		}
-		return 0
 	})
 }
 

cmd/devp2p/nodeset.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"bytes"
+	"cmp"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -104,13 +105,7 @@ func (ns nodeSet) topN(n int) nodeSet {
 		byscore = append(byscore, v)
 	}
 	slices.SortFunc(byscore, func(a, b nodeJSON) int {
-		if a.Score > b.Score {
+		return cmp.Compare(b.Score, a.Score)
-			return -1
-		}
-		if a.Score < b.Score {
-			return 1
-		}
-		return 0
 	})
 	result := make(nodeSet, n)
 	for _, v := range byscore[:n] {

core/state/snapshot/iterator_fast.go

@@ -18,6 +18,7 @@ package snapshot
 
 import (
 	"bytes"
+	"cmp"
 	"fmt"
 	"slices"
 	"sort"
@@ -45,13 +46,7 @@ func (it *weightedIterator) Cmp(other *weightedIterator) int {
 		return 1
 	}
 	// Same account/storage-slot in multiple layers, split by priority
-	if it.priority < other.priority {
+	return cmp.Compare(it.priority, other.priority)
-		return -1
-	}
-	if it.priority > other.priority {
-		return 1
-	}
-	return 0
 }
 
 // fastIterator is a more optimized multi-layer iterator which maintains a

p2p/protocol.go

@@ -17,6 +17,7 @@
 package p2p
 
 import (
+	"cmp"
 	"fmt"
 	"strings"
 
@@ -81,13 +82,7 @@ func (cap Cap) String() string {
 // Cmp defines the canonical sorting order of capabilities.
 func (cap Cap) Cmp(other Cap) int {
 	if cap.Name == other.Name {
-		if cap.Version < other.Version {
+		return cmp.Compare(cap.Version, other.Version)
-			return -1
-		}
-		if cap.Version > other.Version {
-			return 1
-		}
-		return 0
 	}
 	return strings.Compare(cap.Name, other.Name)
 }

triedb/pathdb/iterator_fast.go

@@ -18,6 +18,7 @@ package pathdb
 
 import (
 	"bytes"
+	"cmp"
 	"fmt"
 	"slices"
 	"sort"
@@ -45,13 +46,7 @@ func (it *weightedIterator) Cmp(other *weightedIterator) int {
 		return 1
 	}
 	// Same account/storage-slot in multiple layers, split by priority
-	if it.priority < other.priority {
+	return cmp.Compare(it.priority, other.priority)
-		return -1
-	}
-	if it.priority > other.priority {
-		return 1
-	}
-	return 0
 }
 
 // fastIterator is a more optimized multi-layer iterator which maintains a