fix(tests): cleanup races & lint

ipfs · Apr 21, 2020 · e42842b · e42842b
1 parent 1cd3631
commit e42842b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/impl/graphsync_test.go b/impl/graphsync_test.go
@@ -239,11 +239,14 @@ func TestPauseResume(t *testing.T) {
 
 	stopPoint := 50
 	blocksSent := 0
-	var requestID graphsync.RequestID
+	requestIDChan := make(chan graphsync.RequestID, 1)
 	responder.RegisterOutgoingBlockHook(func(p peer.ID, requestData graphsync.RequestData, blockData graphsync.BlockData, hookActions graphsync.OutgoingBlockHookActions) {
 		_, has := requestData.Extension(td.extensionName)
 		if has {
-			requestID = requestData.ID()
+			select {
+			case requestIDChan <- requestData.ID():
+			default:
+			}
 			blocksSent++
 			if blocksSent == stopPoint {
 				hookActions.PauseResponse()
@@ -259,7 +262,9 @@ func TestPauseResume(t *testing.T) {
 	timer := time.NewTimer(100 * time.Millisecond)
 	testutil.AssertDoesReceiveFirst(t, timer.C, "should pause request", progressChan)
 
-	responder.UnpauseResponse(td.host1.ID(), requestID)
+	requestID := <-requestIDChan
+	err := responder.UnpauseResponse(td.host1.ID(), requestID)
+	require.NoError(t, err)
 
 	blockChain.VerifyRemainder(ctx, progressChan, stopPoint)
 	testutil.VerifyEmptyErrors(ctx, t, errChan)

diff --git a/requestmanager/requestmanager.go b/requestmanager/requestmanager.go
@@ -3,7 +3,6 @@ package requestmanager
 import (
 	"context"
 	"fmt"
-	"math"
 
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-graphsync"
@@ -23,8 +22,6 @@ import (
 var log = logging.Logger("graphsync")
 
 const (
-	// maxPriority is the max priority as defined by the graphsync protocol
-	maxPriority = graphsync.Priority(math.MaxInt32)
 	// defaultPriority is the default priority for requests sent by graphsync
 	defaultPriority = graphsync.Priority(0)
 )