Use new anacrolix/multiless, and incorporate Peer.Trusted into peer prioritization

[btrtrc.git] / prioritized_peers.go

diff --git a/prioritized_peers.go b/prioritized_peers.go
index ca8b8736a626e007988ab650b105958dafec1dbc..faafe00fe23f8a1d32114479f8ff054137b30766 100644 (file)
--- a/prioritized_peers.go
+++ b/prioritized_peers.go
@@ -1,6 +1,9 @@
 package torrent
 
-import "github.com/google/btree"
+import (
+       "github.com/anacrolix/multiless"
+       "github.com/google/btree"
+)
 
 // Peers are stored with their priority at insertion. Their priority may
 // change if our apparent IP changes, we don't currently handle that.
@@ -10,7 +13,11 @@ type prioritizedPeersItem struct {
 }
 
 func (me prioritizedPeersItem) Less(than btree.Item) bool {
-       return me.prio < than.(prioritizedPeersItem).prio
+       other := than.(prioritizedPeersItem)
+       return multiless.New().Bool(
+               me.p.Trusted, other.p.Trusted).Uint32(
+               me.prio, other.prio,
+       ).Less()
 }
 
 type prioritizedPeers struct {