chore: refactor aptos curse converter constructor as a func. option

.changeset/cyan-chairs-search.md

@@ -0,0 +1,5 @@
+---
+"@smartcontractkit/mcms": patch
+---
+
+chore: refactor aptos curse converter constructor as a func. option

chainwrappers/converters.go

@@ -33,7 +33,7 @@ func BuildConverters(chainMetadata map[types.ChainSelector]types.ChainMetadata)
 		case chainsel.FamilyAptos:
 			converter, err = buildAptosTimelockConverter(metadata)
 			if err != nil {
-				return nil, fmt.Errorf("error creating Aptos converter for selector %d: %w", selector, err)
+				return nil, fmt.Errorf("failed to create Aptos converter for selector %d: %w", selector, err)
 			}
 		case chainsel.FamilySui:
 			converter, _ = sui.NewTimelockConverter()
@@ -59,9 +59,10 @@ func buildAptosTimelockConverter(metadata types.ChainMetadata) (sdk.TimelockConv
 		return nil, fmt.Errorf("failed to unmarshal Aptos additional fields: %w", err)
 	}
 
+	opts := []aptos.TimelockConverterOption{}
 	if af.MCMSType.IsCurseMCMS() {
-		return aptos.NewCurseTimelockConverter(), nil
+		opts = append(opts, aptos.WithMCMSType(aptos.MCMSTypeCurse))
 	}
 
-	return aptos.NewTimelockConverter(), nil
+	return aptos.NewTimelockConverter(opts...), nil
 }

sdk/aptos/timelock_converter.go

@@ -33,18 +33,35 @@ type TimelockConverter struct {
 	encoderFn func(address aptos.AccountAddress, client aptos.AptosRpcClient) timelockEncoder
 }
 
-func NewTimelockConverter() *TimelockConverter {
-	return &TimelockConverter{
-		encoderFn: func(address aptos.AccountAddress, client aptos.AptosRpcClient) timelockEncoder {
-			return mcms.Bind(address, client).MCMS().Encoder()
-		},
+type TimelockConverterOption func(*timelockConverterOptions)
+
+type timelockConverterOptions struct {
+	mcmsType MCMSType
+}
+
+func WithMCMSType(mcmsType MCMSType) TimelockConverterOption {
+	return func(opts *timelockConverterOptions) {
+		opts.mcmsType = mcmsType
 	}
 }
 
-func NewCurseTimelockConverter() *TimelockConverter {
+func NewTimelockConverter(opts ...TimelockConverterOption) *TimelockConverter {
+	converterOptions := timelockConverterOptions{mcmsType: MCMSTypeRegular}
+	for _, opt := range opts {
+		opt(&converterOptions)
+	}
+
+	if converterOptions.mcmsType == MCMSTypeCurse {
+		return &TimelockConverter{
+			encoderFn: func(address aptos.AccountAddress, client aptos.AptosRpcClient) timelockEncoder {
+				return curse_mcms.Bind(address, client).CurseMCMS().Encoder()
+			},
+		}
+	}
+
 	return &TimelockConverter{
 		encoderFn: func(address aptos.AccountAddress, client aptos.AptosRpcClient) timelockEncoder {
-			return curse_mcms.Bind(address, client).CurseMCMS().Encoder()
+			return mcms.Bind(address, client).MCMS().Encoder()
 		},
 	}
 }

sdk/aptos/timelock_converter_test.go

@@ -25,14 +25,12 @@ import (
 
 func TestNewTimelockConverter(t *testing.T) {
 	t.Parallel()
+
 	converter := NewTimelockConverter()
 	assert.NotNil(t, converter)
 	assert.NotNil(t, converter.encoderFn)
-}
 
-func TestNewCurseTimelockConverter(t *testing.T) {
-	t.Parallel()
-	converter := NewCurseTimelockConverter()
+	converter = NewTimelockConverter(WithMCMSType(MCMSTypeCurse))
 	assert.NotNil(t, converter)
 	assert.NotNil(t, converter.encoderFn)
 }