From 9a698e0897a18484d7c522b1c1acca4a3b678840 Mon Sep 17 00:00:00 2001
From: Hans Lee <38912532+0xHansLee@users.noreply.github.com>
Date: Fri, 13 Dec 2024 15:15:27 +0900
Subject: [PATCH] chore(cmd): rename operator command (#428)

According to the changes of #358, rename the command for set/unset
operator.

issue: none
---
 client/cmd/flags.go     |  8 ++++----
 client/cmd/validator.go | 44 ++++++++++++++++++++---------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/client/cmd/flags.go b/client/cmd/flags.go
index a3f648d8..bd90e03c 100644
--- a/client/cmd/flags.go
+++ b/client/cmd/flags.go
@@ -71,14 +71,14 @@ func bindValidatorCreateFlags(cmd *cobra.Command, cfg *createValidatorConfig) {
 	cmd.Flags().StringVar(&cfg.Moniker, "moniker", "", "Custom moniker name for this node")
 }
 
-func bindAddOperatorFlags(cmd *cobra.Command, cfg *operatorConfig) {
+func bindSetOperatorFlags(cmd *cobra.Command, cfg *operatorConfig) {
 	bindValidatorBaseFlags(cmd, &cfg.baseConfig)
-	cmd.Flags().StringVar(&cfg.Operator, "operator", "", "Adds an operator to your delegator")
+	cmd.Flags().StringVar(&cfg.Operator, "operator", "", "Sets an operator to your delegator")
 }
 
-func bindRemoveOperatorFlags(cmd *cobra.Command, cfg *operatorConfig) {
+func bindUnsetOperatorFlags(cmd *cobra.Command, cfg *operatorConfig) {
 	bindValidatorBaseFlags(cmd, &cfg.baseConfig)
-	cmd.Flags().StringVar(&cfg.Operator, "operator", "", "Removes an operator from your delegator")
+	cmd.Flags().StringVar(&cfg.Operator, "operator", "", "Unsets an operator from your delegator")
 }
 
 func bindSetWithdrawalAddressFlags(cmd *cobra.Command, cfg *withdrawalConfig) {
diff --git a/client/cmd/validator.go b/client/cmd/validator.go
index 554dfbf0..481836c2 100644
--- a/client/cmd/validator.go
+++ b/client/cmd/validator.go
@@ -143,8 +143,8 @@ func newValidatorCmds() *cobra.Command {
 		newValidatorStakeOnBehalfCmd(),
 		newValidatorUnstakeCmd(),
 		newValidatorUnstakeOnBehalfCmd(),
-		newValidatorAddOperatorCmd(),
-		newValidatorRemoveOperatorCmd(),
+		newValidatorSetOperatorCmd(),
+		newValidatorUnsetOperatorCmd(),
 		newValidatorSetWithdrawalAddressCmd(),
 		newValidatorUnjailCmd(),
 		newValidatorUnjailOnBehalfCmd(),
@@ -177,44 +177,44 @@ func newValidatorCreateCmd() *cobra.Command {
 	return cmd
 }
 
-func newValidatorAddOperatorCmd() *cobra.Command {
+func newValidatorSetOperatorCmd() *cobra.Command {
 	var cfg operatorConfig
 
 	cmd := &cobra.Command{
-		Use:   "add-operator",
-		Short: "Add a new operator to your delegator",
+		Use:   "set-operator",
+		Short: "set an operator to your delegator",
 		Args:  cobra.NoArgs,
 		PreRunE: func(_ *cobra.Command, _ []string) error {
 			return initializeBaseConfig(&cfg.baseConfig)
 		},
 		RunE: runValidatorCommand(
 			validateOperatorFlags,
-			func(ctx context.Context) error { return addOperator(ctx, cfg) },
+			func(ctx context.Context) error { return setOperator(ctx, cfg) },
 		),
 	}
 
-	bindAddOperatorFlags(cmd, &cfg)
+	bindSetOperatorFlags(cmd, &cfg)
 
 	return cmd
 }
 
-func newValidatorRemoveOperatorCmd() *cobra.Command {
+func newValidatorUnsetOperatorCmd() *cobra.Command {
 	var cfg operatorConfig
 
 	cmd := &cobra.Command{
-		Use:   "remove-operator",
-		Short: "Removes an existing operator from your delegator",
+		Use:   "unset-operator",
+		Short: "Unsets an existing operator from your delegator",
 		Args:  cobra.NoArgs,
 		PreRunE: func(_ *cobra.Command, _ []string) error {
 			return initializeBaseConfig(&cfg.baseConfig)
 		},
 		RunE: runValidatorCommand(
 			validateOperatorFlags,
-			func(ctx context.Context) error { return removeOperator(ctx, cfg) },
+			func(ctx context.Context) error { return unsetOperator(ctx, cfg) },
 		),
 	}
 
-	bindRemoveOperatorFlags(cmd, &cfg)
+	bindUnsetOperatorFlags(cmd, &cfg)
 
 	return cmd
 }
@@ -507,7 +507,7 @@ func setWithdrawalAddress(ctx context.Context, cfg withdrawalConfig) error {
 	return nil
 }
 
-func addOperator(ctx context.Context, cfg operatorConfig) error {
+func setOperator(ctx context.Context, cfg operatorConfig) error {
 	uncompressedPubKey, err := uncompressPrivateKey(cfg.PrivateKey)
 	if err != nil {
 		return err
@@ -520,19 +520,19 @@ func addOperator(ctx context.Context, cfg operatorConfig) error {
 		return err
 	}
 
-	fmt.Printf("Fee for adding operator: %s wei\n", fee.String())
+	fmt.Printf("Fee for setting operator: %s wei\n", fee.String())
 
-	_, err = prepareAndExecuteTransaction(ctx, &cfg.baseConfig, "addOperator", fee, uncompressedPubKey, operatorAddress)
+	_, err = prepareAndExecuteTransaction(ctx, &cfg.baseConfig, "setOperator", fee, uncompressedPubKey, operatorAddress)
 	if err != nil {
 		return err
 	}
 
-	fmt.Println("Operator added successfully!")
+	fmt.Println("Operator set successfully!")
 
 	return nil
 }
 
-func removeOperator(ctx context.Context, cfg operatorConfig) error {
+func unsetOperator(ctx context.Context, cfg operatorConfig) error {
 	uncompressedPubKey, err := uncompressPrivateKey(cfg.PrivateKey)
 	if err != nil {
 		return err
@@ -545,18 +545,18 @@ func removeOperator(ctx context.Context, cfg operatorConfig) error {
 		return err
 	}
 
-	var removeOperatorFee *big.Int
-	err = cfg.ABI.UnpackIntoInterface(&removeOperatorFee, "fee", result)
+	var unsetOperatorFee *big.Int
+	err = cfg.ABI.UnpackIntoInterface(&unsetOperatorFee, "fee", result)
 	if err != nil {
-		return errors.Wrap(err, "failed to unpack removeOperatorFee")
+		return errors.Wrap(err, "failed to unpack unsetOperatorFee")
 	}
 
-	_, err = prepareAndExecuteTransaction(ctx, &cfg.baseConfig, "removeOperator", removeOperatorFee, uncompressedPubKey, operatorAddress)
+	_, err = prepareAndExecuteTransaction(ctx, &cfg.baseConfig, "unsetOperator", unsetOperatorFee, uncompressedPubKey, operatorAddress)
 	if err != nil {
 		return err
 	}
 
-	fmt.Println("Operator removed successfully!")
+	fmt.Println("Operator unset successfully!")
 
 	return nil
 }