From 56158cae93ec6921b59ff496e15e2475b44b8101 Mon Sep 17 00:00:00 2001 From: Ash-KODES Date: Thu, 21 Mar 2024 11:52:51 +0530 Subject: [PATCH 1/2] min/max stake clean up for bl-update and validator-update commands --- cmd/storage.go | 29 ----------------------------- cmd/validator.go | 28 +--------------------------- 2 files changed, 1 insertion(+), 56 deletions(-) diff --git a/cmd/storage.go b/cmd/storage.go index 2f398907..7d63b8e0 100644 --- a/cmd/storage.go +++ b/cmd/storage.go @@ -139,8 +139,6 @@ var blobberInfoCmd = &cobra.Command{ fmt.Println(" max_offer_duration:", blob.Terms.MaxOfferDuration) fmt.Println("settings:") fmt.Println(" delegate_wallet:", blob.StakePoolSettings.DelegateWallet) - fmt.Println(" min_stake: ", blob.StakePoolSettings.MinStake) - fmt.Println(" max_stake: ", blob.StakePoolSettings.MaxStake) fmt.Println(" num_delegates: ", blob.StakePoolSettings.NumDelegates) fmt.Println(" service_charge: ", blob.StakePoolSettings.ServiceCharge*100, "%") }, @@ -221,31 +219,6 @@ var blobberUpdateCmd = &cobra.Command{ stakePoolSettings := &blockchain.UpdateStakePoolSettings{} var stakePoolSettingChanged bool - if flags.Changed("min_stake") { - var minStake float64 - if minStake, err = flags.GetFloat64("min_stake"); err != nil { - log.Fatal(err) - } - stake, err := common.ToBalance(minStake) - if err != nil { - log.Fatal(err) - } - stakePoolSettings.MinStake = &stake - stakePoolSettingChanged = true - } - - if flags.Changed("max_stake") { - var maxStake float64 - if maxStake, err = flags.GetFloat64("max_stake"); err != nil { - log.Fatal(err) - } - stake, err := common.ToBalance(maxStake) - if err != nil { - log.Fatal(err) - } - stakePoolSettings.MaxStake = &stake - stakePoolSettingChanged = true - } if flags.Changed("num_delegates") { var nd int @@ -387,8 +360,6 @@ func init() { buf.Float64("read_price", 0.0, "update read_price, optional") buf.Float64("write_price", 0.0, "update write_price, optional") buf.Duration("max_offer_duration", 0*time.Second, "update max_offer_duration, optional") - buf.Float64("min_stake", 0.0, "update min_stake, optional") - buf.Float64("max_stake", 0.0, "update max_stake, optional") buf.Int("num_delegates", 0, "update num_delegates, optional") buf.Float64("service_charge", 0.0, "update service_charge, optional") buf.Bool("not_available", true, "(default false) set blobber's availability for new allocations") diff --git a/cmd/validator.go b/cmd/validator.go index 958eb4da..e4a18454 100644 --- a/cmd/validator.go +++ b/cmd/validator.go @@ -24,8 +24,6 @@ func printValidators(nodes []*sdk.Validator) { fmt.Println("is shut down: ", validator.IsShutdown) fmt.Println("settings:") fmt.Println(" delegate_wallet:", validator.DelegateWallet) - fmt.Println(" min_stake: ", validator.MinStake) - fmt.Println(" max_stake: ", validator.MaxStake) fmt.Println(" total_stake: ", validator.StakeTotal) fmt.Println(" num_delegates: ", validator.NumDelegates) fmt.Println(" service_charge: ", validator.ServiceCharge*100, "%") @@ -126,29 +124,7 @@ var validatorUpdateCmd = &cobra.Command{ updateValidator := new(sdk.UpdateValidator) updateValidator.ID = common.Key(validatorID) - if flags.Changed("min_stake") { - var minStake float64 - if minStake, err = flags.GetFloat64("min_stake"); err != nil { - log.Fatal(err) - } - stake, err := common.ToBalance(minStake) - if err != nil { - log.Fatal(err) - } - updateValidator.MinStake = &stake - } - - if flags.Changed("max_stake") { - var maxStake float64 - if maxStake, err = flags.GetFloat64("max_stake"); err != nil { - log.Fatal(err) - } - stake, err := common.ToBalance(maxStake) - if err != nil { - log.Fatal(err) - } - updateValidator.MaxStake = &stake - } + if flags.Changed("num_delegates") { var nd int @@ -186,8 +162,6 @@ func init() { buf := validatorUpdateCmd.Flags() buf.String("validator_id", "", "validator ID, required") - buf.Float64("min_stake", 0.0, "update min_stake, optional") - buf.Float64("max_stake", 0.0, "update max_stake, optional") buf.Int("num_delegates", 0, "update num_delegates, optional") buf.Float64("service_charge", 0.0, "update service_charge, optional") validatorUpdateCmd.MarkFlagRequired("validator_id") From 82f8c05730664a0a0bd7eea031ca572c36e913c3 Mon Sep 17 00:00:00 2001 From: Ash-KODES Date: Thu, 21 Mar 2024 11:55:18 +0530 Subject: [PATCH 2/2] Removing spaces --- cmd/validator.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/validator.go b/cmd/validator.go index e4a18454..b62579d8 100644 --- a/cmd/validator.go +++ b/cmd/validator.go @@ -125,7 +125,6 @@ var validatorUpdateCmd = &cobra.Command{ updateValidator := new(sdk.UpdateValidator) updateValidator.ID = common.Key(validatorID) - if flags.Changed("num_delegates") { var nd int if nd, err = flags.GetInt("num_delegates"); err != nil {