Remove duplicate IP length constant (#2733)

StephenButtolph · web-flow · commit a759c245fbc8 · 2024-02-13T20:21:03.000Z
diff --git a/network/peer/ip.go b/network/peer/ip.go
@@ -44,7 +44,7 @@ func (ip *UnsignedIP) Sign(signer crypto.Signer) (*SignedIP, error) {
 
 func (ip *UnsignedIP) bytes() []byte {
 	p := wrappers.Packer{
-		Bytes: make([]byte, wrappers.IPLen+wrappers.LongLen),
+		Bytes: make([]byte, ips.IPPortLen+wrappers.LongLen),
 	}
 	ips.PackIP(&p, ip.IPPort)
 	p.PackLong(ip.Timestamp)
diff --git a/utils/ips/ip_port.go b/utils/ips/ip_port.go
@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	IPPortLen = 16 + wrappers.ShortLen
+	IPPortLen = net.IPv6len + wrappers.ShortLen
 	nullStr   = "null"
 )
 
diff --git a/utils/wrappers/packing.go b/utils/wrappers/packing.go
@@ -22,8 +22,6 @@ const (
 	LongLen = 8
 	// BoolLen is the number of bytes per bool
 	BoolLen = 1
-	// IPLen is the number of bytes per IP
-	IPLen = 16 + ShortLen
 )
 
 func StringLen(str string) int {

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func (ip UnsignedIP) Sign(signer crypto.Signer) (SignedIP, error) {`
`44`	`44`
`45`	`45`	`func (ip *UnsignedIP) bytes() []byte {`
`46`	`46`	`p := wrappers.Packer{`
`47`		`- Bytes: make([]byte, wrappers.IPLen+wrappers.LongLen),`
	`47`	`+ Bytes: make([]byte, ips.IPPortLen+wrappers.LongLen),`
`48`	`48`	`}`
`49`	`49`	`ips.PackIP(&p, ip.IPPort)`
`50`	`50`	`p.PackLong(ip.Timestamp)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`const (`
`16`		`- IPPortLen = 16 + wrappers.ShortLen`
	`16`	`+ IPPortLen = net.IPv6len + wrappers.ShortLen`
`17`	`17`	`nullStr = "null"`
`18`	`18`	`)`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@ const (`
`22`	`22`	`LongLen = 8`
`23`	`23`	`// BoolLen is the number of bytes per bool`
`24`	`24`	`BoolLen = 1`
`25`		`- // IPLen is the number of bytes per IP`
`26`		`- IPLen = 16 + ShortLen`
`27`	`25`	`)`
`28`	`26`
`29`	`27`	`func StringLen(str string) int {`