]> Sergey Matveev's repositories - btrtrc.git/commitdiff
Switch from missinggo/MultiLess to anacrolix/multiless
authorMatt Joiner <anacrolix@gmail.com>
Wed, 12 Jan 2022 04:07:26 +0000 (15:07 +1100)
committerMatt Joiner <anacrolix@gmail.com>
Wed, 12 Jan 2022 04:07:26 +0000 (15:07 +1100)
multiless.go [deleted file]
peerconn.go

diff --git a/multiless.go b/multiless.go
deleted file mode 100644 (file)
index 99dcf0e..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-package torrent
-
-import "github.com/anacrolix/missinggo/v2"
-
-type (
-       multiLess = missinggo.MultiLess
-)
index d1ebf3a496d2cd0a350fe736b8a0919a93e932cc..164cdc9ca7e71649200f9cbf0fc5d60fd418e9d0 100644 (file)
@@ -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()
 }