From: Matt Joiner Date: Wed, 12 Jan 2022 04:07:26 +0000 (+1100) Subject: Switch from missinggo/MultiLess to anacrolix/multiless X-Git-Tag: v1.41.0~24 X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=c17186bf85cb7a7883dbddefb746ee895c2bba2d;p=btrtrc.git Switch from missinggo/MultiLess to anacrolix/multiless --- diff --git a/multiless.go b/multiless.go deleted file mode 100644 index 99dcf0e3..00000000 --- a/multiless.go +++ /dev/null @@ -1,7 +0,0 @@ -package torrent - -import "github.com/anacrolix/missinggo/v2" - -type ( - multiLess = missinggo.MultiLess -) diff --git a/peerconn.go b/peerconn.go index d1ebf3a4..164cdc9c 100644 --- a/peerconn.go +++ b/peerconn.go @@ -222,10 +222,10 @@ func (cn *PeerConn) isPreferredDirection() bool { // considering only their networking properties. If ok is false, we can't // decide. func (l *PeerConn) hasPreferredNetworkOver(r *PeerConn) bool { - var ml multiLess - ml.NextBool(l.isPreferredDirection(), r.isPreferredDirection()) - ml.NextBool(!l.utp(), !r.utp()) - ml.NextBool(l.ipv6(), r.ipv6()) + var ml multiless.Computation + ml = ml.Bool(r.isPreferredDirection(), l.isPreferredDirection()) + ml = ml.Bool(l.utp(), r.utp()) + ml = ml.Bool(r.ipv6(), l.ipv6()) return ml.Less() }