fix: use contiune instead of return

ipfs-force-community · Mar 30, 2023 · d351777 · d351777
1 parent a7fd163
commit d351777
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/retrievalprovider/requestvalidation.go b/retrievalprovider/requestvalidation.go
@@ -198,7 +198,7 @@ func (rv *ProviderRequestValidator) acceptDeal(ctx context.Context, deal *types.
 	for _, minerDeal := range minerDeals {
 		minerCfg, err := rv.cfg.MinerProviderConfig(minerDeal.Proposal.Provider, true)
 		if err != nil {
-			return retrievalmarket.DealStatusErrored, err
+			continue
 		}
 		if minerCfg.RetrievalPaymentAddress.Unwrap().Empty() {
 			continue

diff --git a/retrievalprovider/stream_handler.go b/retrievalprovider/stream_handler.go
@@ -102,9 +102,9 @@ func (p *RetrievalStreamHandler) HandleQueryStream(stream rmnet.RetrievalQuerySt
 
 		minerCfg, err := p.cfg.MinerProviderConfig(deal.Proposal.Provider, true)
 		if err != nil {
-			answer.Status = retrievalmarket.QueryResponseError
-			answer.Message = err.Error()
-			sendResp(answer)
+			answers[i].Status = retrievalmarket.QueryResponseError
+			answers[i].Message = err.Error()
+			continue
 		}
 		paymentAddr := minerCfg.RetrievalPaymentAddress.Unwrap()
 		if paymentAddr == address.Undef {
@@ -120,28 +120,30 @@ func (p *RetrievalStreamHandler) HandleQueryStream(stream rmnet.RetrievalQuerySt
 		return
 	}
 
-	validAnswers := make([]*retrievalmarket.QueryResponse, 0, validDealCount)
+	var validAnswer *retrievalmarket.QueryResponse
 	for i, deal := range minerDeals {
 		if len(answers[i].Message) != 0 {
 			continue
 		}
 		ask, err := p.askRepo.GetAsk(ctx, deal.Proposal.Provider)
 		if err != nil {
-			answer.Status = retrievalmarket.QueryResponseError
-			answer.Message = fmt.Sprintf("failed to got deal price: %s, %s", deal.Proposal.Provider, err)
 			continue
 		}
 
 		answers[i].MinPricePerByte = ask.PricePerByte
 		answers[i].MaxPaymentInterval = ask.PaymentInterval
 		answers[i].MaxPaymentIntervalIncrease = ask.PaymentIntervalIncrease
 		answers[i].UnsealPrice = ask.UnsealPrice
-		validAnswers = append(validAnswers, &answers[i])
+		validAnswer = &answers[i]
+		break
 	}
 
-	if len(validAnswers) == 0 {
-		sendResp(answers[0])
+	if validAnswer == nil {
+		sendResp(retrievalmarket.QueryResponse{
+			Status:  retrievalmarket.QueryResponseError,
+			Message: "failed to got deal price",
+		})
 	} else {
-		sendResp(*validAnswers[0])
+		sendResp(*validAnswer)
 	}
 }