err handling

smartcontractkit · Dec 9, 2024 · f6786cd · f6786cd
1 parent 4829aca
commit f6786cd
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/core/services/relay/evm/read/multieventtype.go b/core/services/relay/evm/read/multieventtype.go
@@ -25,10 +25,19 @@ type EventQuery struct {
 }
 
 func MultiEventTypeQuery(ctx context.Context, lp logpoller.LogPoller, eventQueries []EventQuery, limitAndSort query.LimitAndSort) (iter.Seq2[string, commontypes.Sequence], error) {
+	seqIter, err := multiEventTypeQueryWithoutErrorWrapping(ctx, lp, eventQueries, limitAndSort)
+	if err != nil {
+		return nil, newMultiEventTypeQueryError(eventQueries, err)
+	}
+
+	return seqIter, nil
+}
+
+func multiEventTypeQueryWithoutErrorWrapping(ctx context.Context, lp logpoller.LogPoller, eventQueries []EventQuery, limitAndSort query.LimitAndSort) (iter.Seq2[string, commontypes.Sequence], error) {
 
 	for _, eq := range eventQueries {
 		if err := eq.EventBinding.validateBound(eq.Address); err != nil {
-			return nil, newMultiEventTypeQueryError(eventQueries, err)
+			return nil, err
 		}
 	}
 
@@ -63,12 +72,12 @@ func MultiEventTypeQuery(ctx context.Context, lp logpoller.LogPoller, eventQueri
 
 	logs, err := lp.FilteredLogs(ctx, []query.Expression{eventQuery}, limitAndSort, queryName)
 	if err != nil {
-		return nil, newMultiEventTypeQueryError(eventQueries, wrapInternalErr(err))
+		return nil, wrapInternalErr(err)
 	}
 
 	seqIter, err := decodeMultiEventTypeLogsIntoSequences(ctx, logs, eventQueries)
 	if err != nil {
-		return nil, newMultiEventTypeQueryError(eventQueries, wrapInternalErr(err))
+		return nil, wrapInternalErr(err)
 	}
 
 	return seqIter, nil