fix linting issues

.changeset/nervous-books-push.md

@@ -2,4 +2,4 @@
 "chainlink": minor
 ---
 
-Updated QueryKey to be able to do advanced queries on contract event data words
+#internal Updated QueryKey to be able to do advanced queries on contract event data words

contracts/.changeset/tall-donkeys-flow.md

@@ -0,0 +1,5 @@
+---
+'@chainlink/contracts': minor
+---
+
+#internal Updated ChainReaderTester to include dynamic and static nested structs in TestStruct

core/chains/evm/logpoller/orm_test.go

@@ -916,7 +916,7 @@ func TestORM_DataWords(t *testing.T) {
 		},
 	}))
 
-	wordFilter := func(wordIdx uint8, word1, word2 uint64) []query.Expression {
+	wordFilter := func(wordIdx int, word1, word2 uint64) []query.Expression {
 		return []query.Expression{
 			logpoller.NewAddressFilter(addr),
 			logpoller.NewEventSigFilter(eventSig),

core/chains/evm/logpoller/parser.go

@@ -498,11 +498,11 @@ type HashedValueComparator struct {
 }
 
 type eventByWordFilter struct {
-	WordIndex            uint8
+	WordIndex            int
 	HashedValueComparers []HashedValueComparator
 }
 
-func NewEventByWordFilter(wordIndex uint8, valueComparers []HashedValueComparator) query.Expression {
+func NewEventByWordFilter(wordIndex int, valueComparers []HashedValueComparator) query.Expression {
 	return query.Expression{Primitive: &eventByWordFilter{
 		WordIndex:            wordIndex,
 		HashedValueComparers: valueComparers,

core/services/relay/evm/chain_reader.go

@@ -365,11 +365,10 @@ func (cr *chainReader) initDWQuerying(contractName, eventName string, eventDWs m
 	dWsDetail := make(map[string]read.DataWordDetail)
 
 	for genericName, onChainName := range dWDefs {
-		for eventId, dWDetail := range eventDWs {
+		for eventID, dWDetail := range eventDWs {
 			// Extract field name in this manner to account for nested fields
-			fieldName := strings.Join(strings.Split(eventId, ".")[1:], ".")
+			fieldName := strings.Join(strings.Split(eventID, ".")[1:], ".")
 			if fieldName == onChainName {
-
 				dWsDetail[genericName] = dWDetail
 
 				dwTypeID := eventName + "." + genericName
@@ -428,7 +427,7 @@ func getEventTypes(event abi.Event) ([]abi.Argument, types.CodecEntry, map[strin
 	indexedAsUnIndexedTypes := make([]abi.Argument, 0, types.MaxTopicFields)
 	indexedTypes := make([]abi.Argument, 0, len(event.Inputs))
 	dataWords := make(map[string]read.DataWordDetail)
-	var dwIndex uint8
+	var dwIndex int
 
 	for _, input := range event.Inputs {
 		if !input.Indexed {
@@ -446,15 +445,15 @@ func getEventTypes(event abi.Event) ([]abi.Argument, types.CodecEntry, map[strin
 	return indexedAsUnIndexedTypes, types.NewCodecEntry(indexedTypes, nil, nil), dataWords
 }
 
-func findFieldIndex(arg abi.Argument, fieldPath string, dataWords map[string]read.DataWordDetail, index uint8) uint8 {
+func findFieldIndex(arg abi.Argument, fieldPath string, dataWords map[string]read.DataWordDetail, index int) int {
 	if isDynamic(arg.Type) {
 		return index + 1
 	}
 
 	return processFields(arg.Type, fieldPath, dataWords, index)
 }
 
-func processFields(fieldType abi.Type, parentFieldPath string, dataWords map[string]read.DataWordDetail, index uint8) uint8 {
+func processFields(fieldType abi.Type, parentFieldPath string, dataWords map[string]read.DataWordDetail, index int) int {
 	switch fieldType.T {
 	case abi.TupleTy:
 		// Recursively process tuple elements
@@ -467,7 +466,7 @@ func processFields(fieldType abi.Type, parentFieldPath string, dataWords map[str
 	case abi.ArrayTy:
 		// Static arrays are not searchable, however, we can reliably calculate their size so that the fields
 		// after them can be searched.
-		return index + uint8(fieldType.Size)
+		return index + fieldType.Size
 	default:
 		dataWords[parentFieldPath] = read.DataWordDetail{
 			Index:    index,

core/services/relay/evm/read/event.go

@@ -81,7 +81,7 @@ type TopicDetail struct {
 // DataWordDetail contains all the information about a single evm Data word.
 // For b.g. first evm data word(32bytes) of USDC log event is uint256 var called valub.
 type DataWordDetail struct {
-	Index uint8
+	Index int
 	abi.Argument
 }