use maps instaed fo ToCamelCase to allow consistnacy, also safer if c…

…ustomers have foo and foo_ both as varibles.
smartcontractkit · Jan 16, 2024 · bce2e3b · bce2e3b
1 parent 8ee5f12
commit bce2e3b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/core/internal/features/ocr2/features_ocr2_test.go b/core/internal/features/ocr2/features_ocr2_test.go
diff --git a/core/services/relay/evm/codec_entry.go b/core/services/relay/evm/codec_entry.go
@@ -3,6 +3,7 @@ package evm
 import (
 	"fmt"
 	"reflect"
+	"strings"
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
@@ -66,8 +67,7 @@ func (entry *codecEntry) Init() error {
 			return fmt.Errorf("%w: empty field names are not supported for multiple returns", commontypes.ErrInvalidType)
 		}
 
-		// To match decoding in abi
-		name := abi.ToCamelCase(arg.Name)
+		name := strings.ToUpper(arg.Name[:1]) + arg.Name[1:]
 		if seenNames[name] {
 			return fmt.Errorf("%w: duplicate field name %s, after ToCamelCase", commontypes.ErrInvalidConfig, name)
 		}

diff --git a/core/services/relay/evm/event_binding.go b/core/services/relay/evm/event_binding.go
@@ -249,8 +249,8 @@ func (e *eventBinding) decodeLog(ctx context.Context, log *logpoller.Log, into a
 		topics[i] = common.Hash(log.Topics[i+1])
 	}
 
-	topicsInto := reflect.New(e.topicInfo.nativeType).Interface()
-	if err := abi.ParseTopics(topicsInto, e.topicInfo.Args, topics); err != nil {
+	topicsInto := map[string]any{}
+	if err := abi.ParseTopicsIntoMap(topicsInto, e.topicInfo.Args, topics); err != nil {
 		return fmt.Errorf("%w: %w", commontypes.ErrInvalidType, err)
 	}
 

diff --git a/integration-tests/actions/ocr2_helpers_local.go b/integration-tests/actions/ocr2_helpers_local.go