Chore: Reuse Aptos field renaming (#49)

* add ability to rename response fields from CR functions

* hexify

* use Aptos field rename type definition

* re-use Aptos field renaming method

* fix tests

* lint fixes

---------

Co-authored-by: stackman27 <sishir.giri@smartcontract.com>

Author: faisal-chainlink

relayer/chainreader/config/config.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-sui/relayer/client"
 
+	aptosCRConfig "github.com/smartcontractkit/chainlink-aptos/relayer/chainreader/config"
 	"github.com/smartcontractkit/chainlink-sui/relayer/codec"
 )
 
@@ -32,7 +33,7 @@ type ChainReaderFunction struct {
 	// Defines a way to transform a tuple result into a JSON object
 	ResultTupleToStruct []string
 	// Defines a mapping for renaming response fields
-	ResultFieldRenames map[string]RenamedField
+	ResultFieldRenames map[string]aptosCRConfig.RenamedField
 }
 
 type ChainReaderEvent struct {
@@ -45,21 +46,12 @@ type ChainReaderEvent struct {
 	client.EventSelector
 
 	// Renames of event field names (optional). When not provided, the field names are used as-is.
-	EventFieldRenames map[string]RenamedField
+	EventFieldRenames map[string]aptosCRConfig.RenamedField
 
 	// Renames provided filters to match the event field names (optional). When not provided, the filters are used as-is.
 	EventFilterRenames map[string]string
 }
 
-type RenamedField struct {
-	// The new field name (optional). This does not need to be provided if this field does not need
-	// to be renamed.
-	NewName string
-
-	// Rename sub-fields. This assumes that the event field value is a struct or a map with string keys.
-	SubFieldRenames map[string]RenamedField
-}
-
 type EventsIndexerConfig struct {
 	PollingInterval time.Duration
 	SyncTimeout     time.Duration

relayer/chainreader/reader/chainreader.go

@@ -19,7 +19,7 @@ import (
 	"github.com/smartcontractkit/chainlink-aptos/relayer/chainreader/loop"
 
 	aptosCRConfig "github.com/smartcontractkit/chainlink-aptos/relayer/chainreader/config"
-	craptosutils "github.com/smartcontractkit/chainlink-aptos/relayer/chainreader/utils"
+	aptosCRUtils "github.com/smartcontractkit/chainlink-aptos/relayer/chainreader/utils"
 
 	"github.com/smartcontractkit/chainlink-sui/relayer/chainreader/config"
 	"github.com/smartcontractkit/chainlink-sui/relayer/chainreader/database"
@@ -202,7 +202,10 @@ func (s *suiChainReader) GetLatestValue(ctx context.Context, readIdentifier stri
 
 		// Apply result field renames if configured
 		if functionConfig.ResultFieldRenames != nil {
-			structResult = applyResultFieldRenames(structResult, functionConfig.ResultFieldRenames).(map[string]any)
+			err = aptosCRUtils.MaybeRenameFields(structResult, functionConfig.ResultFieldRenames)
+			if err != nil {
+				return fmt.Errorf("failed to rename result fields in GetLatestValue: %w", err)
+			}
 		}
 
 		// if we are running in loop plugin mode, we will want to encode the result into JSON bytes
@@ -218,7 +221,10 @@ func (s *suiChainReader) GetLatestValue(ctx context.Context, readIdentifier stri
 		// Apply renames to the result slice or contained maps before encoding
 		var renamed any = results
 		if functionConfig.ResultFieldRenames != nil {
-			renamed = applyResultFieldRenames(renamed, functionConfig.ResultFieldRenames)
+			err = aptosCRUtils.MaybeRenameFields(renamed, functionConfig.ResultFieldRenames)
+			if err != nil {
+				return fmt.Errorf("failed to rename result fields in GetLatestValue: %w", err)
+			}
 		}
 		return s.encodeLoopResult(renamed, returnVal)
 	}
@@ -228,7 +234,10 @@ func (s *suiChainReader) GetLatestValue(ctx context.Context, readIdentifier stri
 	// Apply renames (if any) to the primary result element before decoding
 	var primary any = results[0]
 	if functionConfig.ResultFieldRenames != nil {
-		primary = applyResultFieldRenames(primary, functionConfig.ResultFieldRenames)
+		err = aptosCRUtils.MaybeRenameFields(primary, functionConfig.ResultFieldRenames)
+		if err != nil {
+			return fmt.Errorf("failed to rename result fields in GetLatestValue: %w", err)
+		}
 	}
 
 	// TODO: handle multiple results for non-loop plugin mode
@@ -731,47 +740,6 @@ func (s *suiChainReader) encodeLoopResult(valueField any, returnVal any) error {
 	return nil
 }
 
-// applyResultFieldRenames applies field and sub-field renames to a value.
-// It supports:
-// - map[string]any: renames top-level keys and recurses for sub-fields if configured
-// - []any: applies renames to each element (useful when each element is a map)
-// - primitives or other types: returned as-is
-func applyResultFieldRenames(value any, renames map[string]config.RenamedField) any {
-	switch typed := value.(type) {
-	case map[string]any:
-		result := make(map[string]any, len(typed))
-		for key, val := range typed {
-			// Check if this field has a rename rule
-			if rule, ok := renames[key]; ok {
-				newKey := key
-				if rule.NewName != "" {
-					newKey = rule.NewName
-				}
-				// Recurse into sub-fields if both val and rule specify them
-				if rule.SubFieldRenames != nil {
-					result[newKey] = applyResultFieldRenames(val, rule.SubFieldRenames)
-				} else {
-					result[newKey] = val
-				}
-			} else {
-				// Preserve original field if no rename rule exists
-				result[key] = val
-			}
-		}
-		return result
-	case []any:
-		// Apply renames to each element; if the element is a map, it will be handled above
-		out := make([]any, len(typed))
-		for i := range typed {
-			out[i] = applyResultFieldRenames(typed[i], renames)
-		}
-		return out
-	default:
-		// No transformation for primitives or unsupported types
-		return value
-	}
-}
-
 // getEventConfig retrieves event configuration for the given key
 func (s *suiChainReader) getEventConfig(moduleConfig *config.ChainReaderModule, eventKey string) (*config.ChainReaderEvent, error) {
 	if moduleConfig.Events == nil {
@@ -809,7 +777,7 @@ func (s *suiChainReader) queryEvents(ctx context.Context, eventConfig *config.Ch
 	}
 
 	if eventConfig.EventFilterRenames != nil {
-		expressions = craptosutils.ApplyEventFilterRenames(expressions, eventConfig.EventFilterRenames)
+		expressions = aptosCRUtils.ApplyEventFilterRenames(expressions, eventConfig.EventFilterRenames)
 	}
 
 	// Query events from database

relayer/chainreader/reader/chainreader_local_test.go

@@ -123,7 +123,7 @@ func runChainReaderCounterTest(t *testing.T, log logger.Logger, rpcUrl string) {
 						Name:          "get_address_list",
 						SignerAddress: accountAddress,
 						Params:        []codec.SuiFunctionParam{}, // No parameters needed
-						ResultFieldRenames: map[string]config.RenamedField{
+						ResultFieldRenames: map[string]aptosCRConfig.RenamedField{
 							"addresses": {NewName: "wallets"},
 							"count":     {NewName: "size"},
 						},
@@ -137,7 +137,7 @@ func runChainReaderCounterTest(t *testing.T, log logger.Logger, rpcUrl string) {
 						Name:          "get_simple_result",
 						SignerAddress: accountAddress,
 						Params:        []codec.SuiFunctionParam{}, // No parameters needed
-						ResultFieldRenames: map[string]config.RenamedField{
+						ResultFieldRenames: map[string]aptosCRConfig.RenamedField{
 							"value": {NewName: "renamedValue"},
 						},
 					},
@@ -152,7 +152,7 @@ func runChainReaderCounterTest(t *testing.T, log logger.Logger, rpcUrl string) {
 						SignerAddress:       accountAddress,
 						Params:              []codec.SuiFunctionParam{}, // No parameters needed
 						ResultTupleToStruct: []string{"value", "address", "bool", "struct_tag"},
-						ResultFieldRenames: map[string]config.RenamedField{
+						ResultFieldRenames: map[string]aptosCRConfig.RenamedField{
 							"value":      {NewName: "answer"},
 							"struct_tag": {NewName: "tag"},
 						},