Skip to content

Commit

Permalink
cleanup config type (#139)
Browse files Browse the repository at this point in the history
  • Loading branch information
@shrimalmadhur
shrimalmadhur authored Jun 7, 2024
1 parent d1d6339 commit ff355f4
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 29 deletions.
34 changes: 17 additions & 17 deletions pkg/operator/config/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func CreateCmd(p utils.Prompter) *cli.Command {
Action: func(ctx *cli.Context) error {
skipPrompt := ctx.Bool(YesFlag.Name)

op := types.OperatorConfigNew{}
op := types.OperatorConfig{}

if !skipPrompt {
// Prompt user to generate empty or non-empty files
Expand Down Expand Up @@ -104,15 +104,15 @@ func CreateCmd(p utils.Prompter) *cli.Command {
return createCmd
}

func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (types.OperatorConfigNew, error) {
func promptOperatorInfo(config *types.OperatorConfig, p utils.Prompter) (types.OperatorConfig, error) {
// Prompt and set operator address
operatorAddress, err := p.InputString("Enter your operator address:", "", "",
func(s string) error {
return validateAddressIsNonZeroAndValid(s)
},
)
if err != nil {
return types.OperatorConfigNew{}, err
return types.OperatorConfig{}, err
}
config.Operator.Address = operatorAddress

Expand Down Expand Up @@ -157,7 +157,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type
},
)
if err != nil {
return types.OperatorConfigNew{}, err
return types.OperatorConfig{}, err
}
config.Operator.EarningsReceiverAddress = earningsAddress

Expand All @@ -166,14 +166,14 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type
func(s string) error { return nil },
)
if err != nil {
return types.OperatorConfigNew{}, err
return types.OperatorConfig{}, err
}
config.EthRPCUrl = rpcUrl

// Prompt for network & set chainId
chainId, err := p.Select("Select your network:", []string{"mainnet", "holesky", "local"})
if err != nil {
return types.OperatorConfigNew{}, err
return types.OperatorConfig{}, err
}

switch chainId {
Expand All @@ -191,7 +191,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type
// Prompt for signer type
signerType, err := p.Select("Select your signer type:", []string{"local_keystore", "fireblocks", "web3"})
if err != nil {
return types.OperatorConfigNew{}, err
return types.OperatorConfig{}, err
}

switch signerType {
Expand All @@ -209,7 +209,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type
)

if err != nil {
return types.OperatorConfigNew{}, err
return types.OperatorConfig{}, err
}
config.PrivateKeyStorePath = ecdsaKeyPath
case "fireblocks":
Expand All @@ -224,7 +224,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type
},
)
if err != nil {
return types.OperatorConfigNew{}, err
return types.OperatorConfig{}, err
}
config.FireblocksConfig.APIKey = apiKey

Expand All @@ -238,7 +238,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type
},
)
if err != nil {
return types.OperatorConfigNew{}, err
return types.OperatorConfig{}, err
}
config.FireblocksConfig.BaseUrl = baseUrl

Expand All @@ -252,7 +252,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type
},
)
if err != nil {
return types.OperatorConfigNew{}, err
return types.OperatorConfig{}, err
}
config.FireblocksConfig.VaultAccountName = vaultAccountName

Expand All @@ -266,7 +266,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type
},
)
if err != nil {
return types.OperatorConfigNew{}, err
return types.OperatorConfig{}, err
}
config.FireblocksConfig.Timeout = timeout

Expand All @@ -293,7 +293,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type
},
)
if err != nil {
return types.OperatorConfigNew{}, err
return types.OperatorConfig{}, err
}
config.FireblocksConfig.SecretKey = keyName
awsRegion, err := p.InputString("Enter the AWS region where the secret is stored:", "us-east-1", "",
Expand All @@ -305,13 +305,13 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type
},
)
if err != nil {
return types.OperatorConfigNew{}, err
return types.OperatorConfig{}, err
}
config.FireblocksConfig.AWSRegion = awsRegion

}
if err != nil {
return types.OperatorConfigNew{}, err
return types.OperatorConfig{}, err
}
case "web3":
config.SignerType = types.Web3Signer
Expand All @@ -325,11 +325,11 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type
},
)
if err != nil {
return types.OperatorConfigNew{}, err
return types.OperatorConfig{}, err
}
config.Web3SignerConfig.Url = web3SignerUrl
default:
return types.OperatorConfigNew{}, fmt.Errorf("unknown signer type %s", signerType)
return types.OperatorConfig{}, fmt.Errorf("unknown signer type %s", signerType)
}

return *config, nil
Expand Down
10 changes: 5 additions & 5 deletions pkg/operator/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func printRegistrationInfo(txHash string, operatorAddress common.Address, chainI
}

func getWallet(
cfg *types.OperatorConfigNew,
cfg *types.OperatorConfig,
ethClient eth.Client,
p utils.Prompter,
logger eigensdkLogger.Logger,
Expand Down Expand Up @@ -273,7 +273,7 @@ func expandTilde(path string) (string, error) {
return path, nil
}

func validateAndReturnConfig(configurationFilePath string) (*types.OperatorConfigNew, error) {
func validateAndReturnConfig(configurationFilePath string) (*types.OperatorConfig, error) {
operatorCfg, err := readConfigFile(configurationFilePath)
if err != nil {
return nil, err
Expand Down Expand Up @@ -322,8 +322,8 @@ func validateAndReturnConfig(configurationFilePath string) (*types.OperatorConfi
return operatorCfg, nil
}

func readConfigFile(path string) (*types.OperatorConfigNew, error) {
var operatorCfg types.OperatorConfigNew
func readConfigFile(path string) (*types.OperatorConfig, error) {
var operatorCfg types.OperatorConfig
err := utils.ReadYamlConfig(path, &operatorCfg)
if err != nil {
return nil, err
Expand Down Expand Up @@ -367,7 +367,7 @@ func getWebAppLink(operatorAddress common.Address, chainId *big.Int) string {
}
}

func validateMetadata(operatorCfg *types.OperatorConfigNew) error {
func validateMetadata(operatorCfg *types.OperatorConfig) error {
// Raw GitHub URL validation is only for mainnet
if operatorCfg.ChainId.Cmp(big.NewInt(utils.MainnetChainId)) == 0 {
err := eigenSdkUtils.ValidateRawGithubUrl(operatorCfg.Operator.MetadataUrl)
Expand Down
10 changes: 5 additions & 5 deletions pkg/operator/register_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ func TestGetTransactionLink(t *testing.T) {
func TestValidateMainnetMetadata(t *testing.T) {
var tests = []struct {
name string
operatorCfg *types.OperatorConfigNew
operatorCfg *types.OperatorConfig
expectErr bool
}{
{
name: "Valid metadata",
operatorCfg: &types.OperatorConfigNew{
operatorCfg: &types.OperatorConfig{
Operator: eigensdkTypes.Operator{
MetadataUrl: "https://raw.githubusercontent.com/Layr-Labs/eigendata/master/operators/eigenlabs/metadata.json",
},
Expand All @@ -64,7 +64,7 @@ func TestValidateMainnetMetadata(t *testing.T) {
},
{
name: "Invalid metadata - invalid logo url",
operatorCfg: &types.OperatorConfigNew{
operatorCfg: &types.OperatorConfig{
Operator: eigensdkTypes.Operator{
MetadataUrl: "https://raw.githubusercontent.com/shrimalmadhur/metadata/main/metadata1.json",
},
Expand All @@ -74,7 +74,7 @@ func TestValidateMainnetMetadata(t *testing.T) {
},
{
name: "Invalid metadata - Invalid metadata url",
operatorCfg: &types.OperatorConfigNew{
operatorCfg: &types.OperatorConfig{
Operator: eigensdkTypes.Operator{
MetadataUrl: "https://goerli-operator-metadata.s3.amazonaws.com/metadata.json",
},
Expand All @@ -84,7 +84,7 @@ func TestValidateMainnetMetadata(t *testing.T) {
},
{
name: "Valid metadata for holesky",
operatorCfg: &types.OperatorConfigNew{
operatorCfg: &types.OperatorConfig{
Operator: eigensdkTypes.Operator{
MetadataUrl: "https://goerli-operator-metadata.s3.amazonaws.com/metadata.json",
},
Expand Down
4 changes: 2 additions & 2 deletions pkg/types/operator_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ type Web3SignerConfig struct {
Url string `yaml:"url"`
}

type OperatorConfigNew struct {
type OperatorConfig struct {
Operator eigensdkTypes.Operator `yaml:"operator"`
ELDelegationManagerAddress string `yaml:"el_delegation_manager_address"`
ELAVSDirectoryAddress string
Expand All @@ -51,7 +51,7 @@ type OperatorConfigNew struct {
Web3SignerConfig Web3SignerConfig `yaml:"web3"`
}

func (config OperatorConfigNew) MarshalYAML() (interface{}, error) {
func (config OperatorConfig) MarshalYAML() (interface{}, error) {
return struct {
Operator eigensdkTypes.Operator `yaml:"operator"`
ELDelegationManagerAddress string `yaml:"el_delegation_manager_address"`
Expand Down

0 comments on commit ff355f4

Please sign in to comment.