Move PeerClientName and PeerExtensionIDs to PeerConn

[btrtrc.git] / worse-conns.go

diff --git a/worse-conns.go b/worse-conns.go
index 62895e69151cf3bbfffcd79f6616eee6a53df776..ef33b97902c4cd82f07b3a76f71f1f631a2ce821 100644 (file)
--- a/worse-conns.go
+++ b/worse-conns.go
@@ -34,7 +34,7 @@ type worseConnLensOpts struct {
        incomingIsBad, outgoingIsBad bool
 }
 
-func worseConnInputFromPeer(p *Peer, opts worseConnLensOpts) worseConnInput {
+func worseConnInputFromPeer(p *PeerConn, opts worseConnLensOpts) worseConnInput {
        ret := worseConnInput{
                Useful:             p.useful(),
                LastHelpful:        p.lastHelpful(),
@@ -50,13 +50,6 @@ func worseConnInputFromPeer(p *Peer, opts worseConnLensOpts) worseConnInput {
        return ret
 }
 
-func worseConn(_l, _r *Peer) bool {
-       // TODO: Use generics for ptr to
-       l := worseConnInputFromPeer(_l, worseConnLensOpts{})
-       r := worseConnInputFromPeer(_r, worseConnLensOpts{})
-       return l.Less(&r)
-}
-
 func (l *worseConnInput) Less(r *worseConnInput) bool {
        less, ok := multiless.New().Bool(
                r.BadDirection, l.BadDirection).Bool(
@@ -94,7 +87,7 @@ type worseConnSlice struct {
 func (me *worseConnSlice) initKeys(opts worseConnLensOpts) {
        me.keys = make([]worseConnInput, len(me.conns))
        for i, c := range me.conns {
-               me.keys[i] = worseConnInputFromPeer(&c.Peer, opts)
+               me.keys[i] = worseConnInputFromPeer(c, opts)
        }
 }