optimize the IPAddress and IPNetwork

xgfone · Feb 18, 2019 · f292401 · f292401
1 parent b76917e
commit f292401
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/ipaddr.go b/ipaddr.go
@@ -318,7 +318,7 @@ func (ip IPAddress) Compare(other IPAddress) int {
 
 // Less reports whether ip is less than other.
 func (ip IPAddress) Less(other IPAddress) bool {
-	return ip.BigInt().Cmp(other.BigInt()) < 0
+	return ip.Compare(other) < 0
 }
 
 // IsIPv4 reports whether the ip address is ipv4.

diff --git a/ipnet.go b/ipnet.go
@@ -473,8 +473,7 @@ func (net IPNetwork) Contains(other IPNetwork) bool {
 		return false
 	}
 
-	if net.First().BigInt().Cmp(other.First().BigInt()) <= 0 &&
-		other.Last().BigInt().Cmp(net.Last().BigInt()) <= 0 {
+	if net.first.Compare(other.first) <= 0 && other.first.Compare(net.last) <= 0 {
 		return true
 	}
 	return false
@@ -486,10 +485,7 @@ func (net IPNetwork) HasIP(ip IPAddress) bool {
 		return false
 	}
 
-	first := net.First().BigInt()
-	last := net.Last().BigInt()
-	value := ip.BigInt()
-	if first.Cmp(value) <= 0 && value.Cmp(last) <= 0 {
+	if net.first.Compare(ip) <= 0 && ip.Compare(net.last) <= 0 {
 		return true
 	}
 	return false