Skip to content

Commit 22bb4bd

Browse files
authored
fix(impl): remove accidental legacy field (#310)
1 parent 06cb155 commit 22bb4bd

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

impl/graphsync.go

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ type GraphSync struct {
5555
requestQueue taskqueue.TaskQueue
5656
requestExecutor *executor.Executor
5757
responseAssembler *responseassembler.ResponseAssembler
58-
peerTaskQueue *peertaskqueue.PeerTaskQueue
5958
peerManager *peermanager.PeerMessageManager
6059
incomingRequestQueuedHooks *responderhooks.IncomingRequestQueuedHooks
6160
incomingRequestHooks *responderhooks.IncomingRequestHooks
@@ -240,8 +239,7 @@ func New(parent context.Context, network gsnet.GraphSyncNetwork,
240239
if gsConfig.maxInProgressIncomingRequestsPerPeer > 0 {
241240
ptqopts = append(ptqopts, peertaskqueue.MaxOutstandingWorkPerPeer(int(gsConfig.maxInProgressIncomingRequestsPerPeer)))
242241
}
243-
peerTaskQueue := peertaskqueue.New(ptqopts...)
244-
responseQueue := taskqueue.NewTaskQueue(ctx)
242+
responseQueue := taskqueue.NewTaskQueue(ctx, ptqopts...)
245243
responseManager := responsemanager.New(
246244
ctx,
247245
linkSystem,
@@ -275,7 +273,6 @@ func New(parent context.Context, network gsnet.GraphSyncNetwork,
275273
requestQueue: requestQueue,
276274
requestExecutor: requestExecutor,
277275
responseAssembler: responseAssembler,
278-
peerTaskQueue: peerTaskQueue,
279276
peerManager: peerManager,
280277
incomingRequestQueuedHooks: requestQueuedHooks,
281278
incomingRequestHooks: incomingRequestHooks,
@@ -441,13 +438,7 @@ func (gs *GraphSync) CancelRequest(ctx context.Context, requestID graphsync.Requ
441438
// Stats produces insight on the current state of a graphsync exchange
442439
func (gs *GraphSync) Stats() graphsync.Stats {
443440
outgoingRequestStats := gs.requestQueue.Stats()
444-
445-
ptqstats := gs.peerTaskQueue.Stats()
446-
incomingRequestStats := graphsync.RequestStats{
447-
TotalPeers: uint64(ptqstats.NumPeers),
448-
Active: uint64(ptqstats.NumActive),
449-
Pending: uint64(ptqstats.NumPending),
450-
}
441+
incomingRequestStats := gs.responseQueue.Stats()
451442
outgoingResponseStats := gs.responseAllocator.Stats()
452443

453444
return graphsync.Stats{

taskqueue/taskqueue.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ type WorkerTaskQueue struct {
4242
}
4343

4444
// NewTaskQueue initializes a new queue
45-
func NewTaskQueue(ctx context.Context) *WorkerTaskQueue {
45+
func NewTaskQueue(ctx context.Context, ptqopts ...peertaskqueue.Option) *WorkerTaskQueue {
4646
ctx, cancelFn := context.WithCancel(ctx)
4747
return &WorkerTaskQueue{
4848
ctx: ctx,
4949
cancelFn: cancelFn,
50-
PeerTaskQueue: peertaskqueue.New(),
50+
PeerTaskQueue: peertaskqueue.New(ptqopts...),
5151
workSignal: make(chan struct{}, 1),
5252
noTaskCond: sync.NewCond(&sync.Mutex{}),
5353
ticker: time.NewTicker(thawSpeed),

0 commit comments

Comments
 (0)