fix: differentiate error handling for proposerFromLocalNode and proposerFromNode

Author: soonkuk

isaac/proposal_selector.go

@@ -118,7 +118,7 @@ func (p *BaseProposalSelector) selectInternal(
 
 		return nil, errors.WithMessagef(err, "get suffrage for height, %d", point.Height())
 	case len(i) < 2:
-		return p.proposalFromNode(wctx, point, i[0], previousBlock)
+		return p.proposalFromLocalNode(wctx, point, i[0], previousBlock)
 	default:
 		nodes = i
 	}
@@ -161,11 +161,11 @@ func (p *BaseProposalSelector) selectFromProposer(
 	nodes []base.Node,
 	previousBlock util.Hash,
 ) (base.ProposalSignFact, base.Address, error) {
-	e := util.StringError("select proposal from proposer")
+	e := util.StringError("proposal from selected proposer")
 
 	proposer, err := p.args.ProposerSelectFunc(ctx, point, nodes, previousBlock)
 	if err != nil {
-		return nil, nil, e.WithMessage(err, "select proposer")
+		return nil, nil, e.WithMessage(err, "proposer select")
 	}
 
 	pr, err := p.proposalFromNode(ctx, point, proposer, previousBlock)
@@ -176,6 +176,41 @@ func (p *BaseProposalSelector) selectFromProposer(
 	return pr, proposer.Address(), err
 }
 
+func (p *BaseProposalSelector) proposalFromLocalNode(
+	ctx context.Context,
+	point base.Point,
+	proposer base.Node,
+	previousBlock util.Hash,
+) (base.ProposalSignFact, error) {
+	ticker := time.NewTicker(time.Millisecond * 33)
+	defer ticker.Stop()
+
+	var reset sync.Once
+
+	for {
+		select {
+		case <-ctx.Done():
+			return nil, errors.WithStack(ctx.Err())
+		case <-ticker.C:
+			reset.Do(func() {
+				ticker.Reset(p.args.RequestProposalInterval)
+			})
+
+			switch pr, err := p.findProposal(ctx, point, proposer, previousBlock); {
+			case err == nil:
+				return pr, nil
+			case errors.Is(err, context.Canceled), errors.Is(err, context.DeadlineExceeded):
+				// NOTE ignore context error from findProposal; if context error
+				// is from main context, it will be catched from the main select
+				// ctx.Done().
+			case errors.Is(err, errFailedToRequestProposalToNode):
+			default:
+				return nil, errors.WithMessage(err, "find proposal")
+			}
+		}
+	}
+}
+
 func (p *BaseProposalSelector) proposalFromNode(
 	ctx context.Context,
 	point base.Point,
@@ -204,6 +239,7 @@ func (p *BaseProposalSelector) proposalFromNode(
 				// is from main context, it will be catched from the main select
 				// ctx.Done().
 			case errors.Is(err, errFailedToRequestProposalToNode):
+				return nil, errors.WithMessage(err, "find proposal")
 			default:
 				return nil, errors.WithMessage(err, "find proposal")
 			}
@@ -392,7 +428,7 @@ func ConcurrentRequestProposal(
 				switch pr, found, err := client.RequestProposal(ctx, ci, point, proposer.Address(), previousBlock); {
 				case err != nil:
 					return nil
-				case !found:
+				case !found || pr == nil:
 					return nil
 				case !isExpectedValidProposal(point, proposer, pr, networkID):
 					return nil