common bump

smartcontractkit · Nov 27, 2024 · 6ca610c · 6ca610c
1 parent 5c2059f
commit 6ca610c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/core/services/relay/evm/evmtesting/bindings_test_adapter.go b/core/services/relay/evm/evmtesting/bindings_test_adapter.go
@@ -36,7 +36,7 @@ func WrapContractReaderTesterWithBindings(t *testing.T, wrapped *EVMChainCompone
 		interfacetests.ContractReaderBatchGetLatestValueSetsErrorsProperly, interfacetests.ContractReaderBatchGetLatestValueNoArgumentsWithSliceReturn, interfacetests.ContractReaderBatchGetLatestValueWithModifiersOwnMapstructureOverride,
 		interfacetests.ContractReaderQueryKeyNotFound, interfacetests.ContractReaderQueryKeyReturnsData, interfacetests.ContractReaderQueryKeyReturnsDataAsValuesDotValue, interfacetests.ContractReaderQueryKeyReturnsDataAsValuesDotValue,
 		interfacetests.ContractReaderQueryKeyCanFilterWithValueComparator, interfacetests.ContractReaderQueryKeyCanLimitResultsWithCursor,
-		interfacetests.ContractReaderQueryKeysNotFound, interfacetests.ContractReaderQueryKeysReturnsData, interfacetests.ContractReaderQueryKeyReturnsDataAsValuesDotValue, interfacetests.ContractReaderQueryKeysReturnsDataAsValuesDotValue,
+		interfacetests.ContractReaderQueryKeysNotFound, interfacetests.ContractReaderQueryKeysReturnsData, interfacetests.ContractReaderQueryKeysReturnsDataTwoEventTypes, interfacetests.ContractReaderQueryKeysReturnsDataAsValuesDotValue,
 		interfacetests.ContractReaderQueryKeysCanFilterWithValueComparator, interfacetests.ContractReaderQueryKeysCanLimitResultsWithCursor,
 		ContractReaderQueryKeyFilterOnDataWordsWithValueComparator, ContractReaderQueryKeyOnDataWordsWithValueComparatorOnNestedField,
 		ContractReaderQueryKeyFilterOnDataWordsWithValueComparatorOnDynamicField, ContractReaderQueryKeyFilteringOnDataWordsUsingValueComparatorsOnFieldsWithManualIndex,

diff --git a/core/services/relay/evm/read/multieventtype.go b/core/services/relay/evm/read/multieventtype.go
@@ -85,11 +85,6 @@ func MultiEventTypeQuery(ctx context.Context, lp logpoller.LogPoller, eventQueri
 		return nil, wrapInternalErr(err)
 	}
 
-	// no need to return an error. an empty list is fine
-	if len(logs) == 0 {
-		return nil, nil
-	}
-
 	return decodeMultiEventTypeLogsIntoSequences(ctx, logs, eventQueries)
 }
 
@@ -123,7 +118,6 @@ func decodeMultiEventTypeLogsIntoSequences(ctx context.Context, logs []logpoller
 				},
 			},
 		}
-		sequenceWithKeys = append(sequenceWithKeys, seqWithKey)
 
 		var typeVal reflect.Value
 
@@ -148,6 +142,8 @@ func decodeMultiEventTypeLogsIntoSequences(ctx context.Context, logs []logpoller
 			}
 			seqWithKey.Sequence.Data = &wrappedValue
 		}
+
+		sequenceWithKeys = append(sequenceWithKeys, seqWithKey)
 	}
 
 	return func(yield func(string, commontypes.Sequence) bool) {