From 02f82131eabb5b96c4e307dadbb87382b67ccc94 Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Tue, 13 Oct 2020 13:33:22 +1100 Subject: [PATCH] Move pexConnState from peer to PeerConn --- peerconn.go | 3 ++- pex_test.go | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/peerconn.go b/peerconn.go index e13e9fa3..8ff84102 100644 --- a/peerconn.go +++ b/peerconn.go @@ -82,7 +82,6 @@ type peer struct { // response. metadataRequests []bool sentHaves bitmap.Bitmap - pex pexConnState // Stuff controlled by the remote peer. peerInterested bool @@ -135,6 +134,8 @@ type PeerConn struct { writeBuffer *bytes.Buffer uploadTimer *time.Timer writerCond sync.Cond + + pex pexConnState } func (cn *PeerConn) connStatusString() string { diff --git a/pex_test.go b/pex_test.go index 72d97a64..161ea1ba 100644 --- a/pex_test.go +++ b/pex_test.go @@ -75,7 +75,7 @@ func TestPexAdded(t *testing.T) { func TestPexDropped(t *testing.T) { t.Run("belowTarg", func(t *testing.T) { s := &pexState{nc: 1} - s.Drop(&PeerConn{peer: peer{RemoteAddr: addrs[0], pex: pexConnState{Listed: true}}}) + s.Drop(&PeerConn{peer: peer{RemoteAddr: addrs[0]}, pex: pexConnState{Listed: true}}) targ := &pexState{ hold: []pexEvent{pexEvent{pexDrop, addrs[0], 0}}, nc: 0, @@ -84,7 +84,7 @@ func TestPexDropped(t *testing.T) { }) t.Run("aboveTarg", func(t *testing.T) { s := &pexState{nc: pexTargAdded + 1} - s.Drop(&PeerConn{peer: peer{RemoteAddr: addrs[0], pex: pexConnState{Listed: true}}}) + s.Drop(&PeerConn{peer: peer{RemoteAddr: addrs[0]}, pex: pexConnState{Listed: true}}) targ := &pexState{ ev: []pexEvent{pexEvent{pexDrop, addrs[0], 0}}, nc: pexTargAdded, @@ -93,7 +93,7 @@ func TestPexDropped(t *testing.T) { }) t.Run("aboveTargNotListed", func(t *testing.T) { s := &pexState{nc: pexTargAdded + 1} - s.Drop(&PeerConn{peer: peer{RemoteAddr: addrs[0], pex: pexConnState{Listed: false}}}) + s.Drop(&PeerConn{peer: peer{RemoteAddr: addrs[0]}, pex: pexConnState{Listed: false}}) targ := &pexState{nc: pexTargAdded + 1} require.EqualValues(t, targ, s) }) -- 2.48.1