fix changed slices.SortFunc signature

Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
fonsecas72 · Aug 24, 2023 · 6a159bb · 6a159bb
1 parent d8b3888
commit 6a159bb
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/pkg/util/util.go b/pkg/util/util.go
@@ -119,16 +119,12 @@ func EqualIPsUnsorted(s1, s2 []net.IP) bool {
 		s2_2[i] = s2[i].To16()
 	}
 
-	// TODO: the function signature will change to func(a net.IP, b net.IP) int when we upgrade to go 1.21
-	slices.SortFunc(s1_2, func(a net.IP, b net.IP) bool {
-		// TODO: this will just change to bytes.Compare (without the <= 0) after we upgrade to go 1.21
-		return bytes.Compare([]byte(a), []byte(b)) <= 0
+	slices.SortFunc(s1_2, func(a net.IP, b net.IP) int {
+		return bytes.Compare([]byte(a), []byte(b))
 	})
 
-	// TODO: the function signature will change to func(a net.IP, b net.IP) int when we upgrade to go 1.21
-	slices.SortFunc(s2_2, func(a net.IP, b net.IP) bool {
-		// TODO: this will just change to bytes.Compare (without the <= 0) after we upgrade to go 1.21
-		return bytes.Compare([]byte(a), []byte(b)) <= 0
+	slices.SortFunc(s2_2, func(a net.IP, b net.IP) int {
+		return bytes.Compare([]byte(a), []byte(b))
 	})
 
 	return slices.EqualFunc(s1_2, s2_2, func(a net.IP, b net.IP) bool {