From c17186bf85cb7a7883dbddefb746ee895c2bba2d Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Wed, 12 Jan 2022 15:07:26 +1100 Subject: [PATCH] Switch from missinggo/MultiLess to anacrolix/multiless --- multiless.go | 7 ------- peerconn.go | 8 ++++---- 2 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 multiless.go 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() } -- 2.48.1