From 4eb6a49f27cefcb8ce07822af9ae4348ce42c6a7 Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Wed, 11 May 2022 14:14:25 +1000 Subject: [PATCH] Use intermediate t in Peer.getDesiredRequestState --- requesting.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/requesting.go b/requesting.go index ece5dc39..3c204b84 100644 --- a/requesting.go +++ b/requesting.go @@ -184,22 +184,23 @@ type desiredRequestState struct { } func (p *Peer) getDesiredRequestState() (desired desiredRequestState) { - if !p.t.haveInfo() { + t := p.t + if !t.haveInfo() { return } - if p.t.closed.IsSet() { + if t.closed.IsSet() { return } - input := p.t.getRequestStrategyInput() + input := t.getRequestStrategyInput() requestHeap := desiredPeerRequests{ peer: p, pieceStates: make(map[pieceIndex]request_strategy.PieceRequestOrderState), } request_strategy.GetRequestablePieces( input, - p.t.getPieceRequestOrder(), + t.getPieceRequestOrder(), func(ih InfoHash, pieceIndex int, pieceExtra request_strategy.PieceRequestOrderState) { - if ih != p.t.infoHash { + if ih != t.infoHash { return } if !p.peerHasPiece(pieceIndex) { @@ -231,7 +232,7 @@ func (p *Peer) getDesiredRequestState() (desired desiredRequestState) { }) }, ) - p.t.assertPendingRequests() + t.assertPendingRequests() desired.Requests = requestHeap return } -- 2.48.1