Merge pull request #215 from 0chain/72-mn-update-settings-duplicate-o…

…f-mn-update-node-settings

Remove of mn-update-settings

cmd/minersc.go

@@ -16,122 +16,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var minerscUpdateSettings = &cobra.Command{
-	Use:   "mn-update-settings",
-	Short: "Change miner/sharder settings in Miner SC.",
-	Long:  "Change miner/sharder settings in Miner SC by delegate wallet.",
-	Args:  cobra.MinimumNArgs(0),
-	Run: func(cmd *cobra.Command, args []string) {
-
-		var (
-			flags = cmd.Flags()
-			id    string
-			err   error
-		)
-
-		if !flags.Changed("id") {
-			log.Fatal("missing id flag")
-		}
-
-		if id, err = flags.GetString("id"); err != nil {
-			log.Fatal(err)
-		}
-
-		var (
-			miner     *zcncore.MinerSCMinerInfo
-			wg        sync.WaitGroup
-			statusBar = &ZCNStatus{wg: &wg}
-		)
-		wg.Add(1)
-		if err = zcncore.GetMinerSCNodeInfo(id, statusBar); err != nil {
-			log.Fatal(err)
-		}
-		wg.Wait()
-
-		if !statusBar.success {
-			log.Fatal("fatal:", statusBar.errMsg)
-		}
-
-		miner = new(zcncore.MinerSCMinerInfo)
-		err = json.Unmarshal([]byte(statusBar.errMsg), miner)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		miner = &zcncore.MinerSCMinerInfo{
-			SimpleMiner: zcncore.SimpleMiner{
-				ID: id,
-			},
-			MinerSCDelegatePool: zcncore.MinerSCDelegatePool{
-				Settings: zcncore.StakePoolSettings{
-					NumDelegates: miner.Settings.NumDelegates,
-					MinStake:     miner.Settings.MinStake,
-					MaxStake:     miner.Settings.MaxStake,
-				},
-			},
-		}
-
-		if flags.Changed("num_delegates") {
-			miner.Settings.NumDelegates, err = flags.GetInt("num_delegates")
-			if err != nil {
-				log.Fatal(err)
-			}
-		}
-
-		if flags.Changed("min_stake") {
-			var min float64
-			if min, err = flags.GetFloat64("min_stake"); err != nil {
-				log.Fatal(err)
-			}
-			miner.Settings.MinStake = common.Balance(zcncore.ConvertToValue(min))
-		}
-
-		if flags.Changed("max_stake") {
-			var max float64
-			if max, err = flags.GetFloat64("max_stake"); err != nil {
-				log.Fatal(err)
-			}
-			miner.Settings.MaxStake = common.Balance(zcncore.ConvertToValue(max))
-		}
-
-		txn, err := zcncore.NewTransaction(statusBar, 0, nonce)
-		if err != nil {
-			log.Fatal(err)
-		}
-		wg.Add(1)
-		if err = txn.MinerSCMinerSettings(miner); err != nil {
-			log.Fatal(err)
-		}
-		wg.Wait()
-
-		if !statusBar.success {
-			log.Fatal("fatal:", statusBar.errMsg)
-		}
-
-		statusBar.success = false
-		wg.Add(1)
-		if err = txn.Verify(); err != nil {
-			log.Fatal(err)
-		}
-		wg.Wait()
-
-		if statusBar.success {
-			switch txn.GetVerifyConfirmationStatus() {
-			case zcncore.ChargeableError:
-				ExitWithError("\n", strings.Trim(txn.GetVerifyOutput(), "\""))
-			case zcncore.Success:
-				fmt.Printf("settings updated\nHash: %v", txn.GetTransactionHash())
-			default:
-				ExitWithError("\nExecute settings update update smart contract failed. Unknown status code: " +
-					strconv.Itoa(int(txn.GetVerifyConfirmationStatus())))
-			}
-			return
-		} else {
-			log.Fatal("fatal:", statusBar.errMsg)
-		}
-	},
-}
-
 var minerscInfo = &cobra.Command{
 	Use:   "mn-info",
 	Short: "Get miner/sharder info from Miner SC.",
@@ -627,7 +511,6 @@ var minerscUnlock = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(minerscUpdateSettings)
 	rootCmd.AddCommand(minerscInfo)
 	rootCmd.AddCommand(minerscUserInfo)
 	rootCmd.AddCommand(minerscPoolInfo)
@@ -640,12 +523,6 @@ func init() {
 	minerscSharders.PersistentFlags().Bool("json", false, "as JSON")
 	minerscSharders.PersistentFlags().Bool("all", false, "include all registered sharders")
 
-	minerscUpdateSettings.PersistentFlags().String("id", "", "miner/sharder ID to update")
-	minerscUpdateSettings.PersistentFlags().Int("num_delegates", 0, "max number of delegate pools")
-	minerscUpdateSettings.PersistentFlags().Float64("min_stake", 0.0, "min stake allowed")
-	minerscUpdateSettings.PersistentFlags().Float64("max_stake", 0.0, "max stake allowed")
-	minerscUpdateSettings.MarkFlagRequired("id")
-
 	minerscInfo.PersistentFlags().String("id", "", "miner/sharder ID to get info for")
 	minerscInfo.MarkFlagRequired("id")
 

cmd/updatenode.go

@@ -13,7 +13,7 @@ import (
 )
 
 var minerscUpdateNodeSettings = &cobra.Command{
-	Use:   "mn-update-node-settings",
+	Use:   "mn-update-settings",
 	Short: "Change miner/sharder settings in Miner SC.",
 	Long:  "Change miner/sharder settings in Miner SC by delegate wallet.",
 	Args:  cobra.MinimumNArgs(0),