fix(responsecollector): don't block channels

make sure order channels are consumed in repsonse collector doesn't block sends on the other

requestmanager/requestmanager_test.go

@@ -658,10 +658,10 @@ func TestRequestReturnsMissingBlocks(t *testing.T) {
 	for _, block := range blocks {
 		fal.responseOn(rr.gsr.ID(), cidlink.Link{Cid: block.Cid()}, types.AsyncLoadResult{Data: nil, Err: fmt.Errorf("Terrible Thing")})
 	}
+	verifyEmptyResponse(ctx, t, returnedResponseChan)
 	errs := collectErrors(ctx, t, returnedErrorChan)
 	if len(errs) != len(blocks) {
 		t.Fatal("did not send all errors")
 	}
-	verifyEmptyResponse(ctx, t, returnedResponseChan)
 
 }

requestmanager/responsecollector.go

@@ -23,9 +23,7 @@ func (rc *responseCollector) collectResponses(
 
 	go func() {
 		var receivedResponses []ResponseProgress
-		var receivedErrors []error
 		defer close(returnedResponses)
-		defer close(returnedErrors)
 		outgoingResponses := func() chan<- ResponseProgress {
 			if len(receivedResponses) == 0 {
 				return nil
@@ -38,6 +36,30 @@ func (rc *responseCollector) collectResponses(
 			}
 			return receivedResponses[0]
 		}
+		for len(receivedResponses) > 0 || incomingResponses != nil {
+			select {
+			case <-rc.ctx.Done():
+				return
+			case <-requestCtx.Done():
+				if incomingResponses != nil {
+					cancelRequest()
+				}
+				return
+			case response, ok := <-incomingResponses:
+				if !ok {
+					incomingResponses = nil
+				} else {
+					receivedResponses = append(receivedResponses, response)
+				}
+			case outgoingResponses() <- nextResponse():
+				receivedResponses = receivedResponses[1:]
+			}
+		}
+	}()
+	go func() {
+		var receivedErrors []error
+		defer close(returnedErrors)
+
 		outgoingErrors := func() chan<- error {
 			if len(receivedErrors) == 0 {
 				return nil
@@ -51,23 +73,12 @@ func (rc *responseCollector) collectResponses(
 			return receivedErrors[0]
 		}
 
-		for len(receivedResponses) > 0 || len(receivedErrors) > 0 || incomingResponses != nil || incomingErrors != nil {
+		for len(receivedErrors) > 0 || incomingErrors != nil {
 			select {
 			case <-rc.ctx.Done():
 				return
 			case <-requestCtx.Done():
-				if incomingResponses != nil {
-					cancelRequest()
-				}
 				return
-			case response, ok := <-incomingResponses:
-				if !ok {
-					incomingResponses = nil
-				} else {
-					receivedResponses = append(receivedResponses, response)
-				}
-			case outgoingResponses() <- nextResponse():
-				receivedResponses = receivedResponses[1:]
 			case err, ok := <-incomingErrors:
 				if !ok {
 					incomingErrors = nil