diff --git a/cmd/storage.go b/cmd/storage.go index 7da2cf4a..286b8186 100644 --- a/cmd/storage.go +++ b/cmd/storage.go @@ -2,6 +2,7 @@ package cmd import ( "fmt" + "github.com/0chain/common/core/currency" "log" "time" @@ -290,21 +291,19 @@ var blobberUpdateCmd = &cobra.Command{ } var resetBlobberStatsCmd = &cobra.Command{ - Use: "reset-blobber-stats", - Short: "Reset blobber stats", - Long: `Reset blobber stats`, - Args: cobra.MinimumNArgs(0), + Use: "reset-blobber-stats", + Short: "Reset blobber stats", + Long: `Reset blobber stats`, + Args: cobra.MinimumNArgs(0), Hidden: true, Run: func(cmd *cobra.Command, args []string) { var ( flags = cmd.Flags() - blobberID string - prevAllocated int64 - prevSavedData int64 - newAllocated int64 - newSavedData int64 - err error + blobberID string + prevTotalOffers currency.Coin + newTotalOffers currency.Coin + err error ) if !flags.Changed("blobber_id") { @@ -314,40 +313,28 @@ var resetBlobberStatsCmd = &cobra.Command{ log.Fatal("error in 'blobber_id' flag: ", err) } - if !flags.Changed("prev_allocated") { - log.Fatal("missing required 'prev_allocated' flag") - } - if prevAllocated, err = flags.GetInt64("prev_allocated"); err != nil { - log.Fatal("error in 'prev_allocated' flag: ", err) - } - - if !flags.Changed("prev_saved_data") { - log.Fatal("missing required 'prev_saved_data' flag") - } - if prevSavedData, err = flags.GetInt64("prev_saved_data"); err != nil { - log.Fatal("error in 'prev_saved_data' flag: ", err) - } - - if !flags.Changed("new_allocated") { - log.Fatal("missing required 'new_allocated' flag") + if !flags.Changed("prev_total_offers") { + log.Fatal("missing required 'prev_total_offers' flag") } - if newAllocated, err = flags.GetInt64("new_allocated"); err != nil { - log.Fatal("error in 'new_allocated' flag: ", err) + var prevTotalOffersInt int64 + if prevTotalOffersInt, err = flags.GetInt64("prev_total_offers"); err != nil { + log.Fatal("error in 'prev_total_offers' flag: ", err) } + prevTotalOffers = currency.Coin(prevTotalOffersInt) - if !flags.Changed("new_saved_data") { - log.Fatal("missing required 'new_saved_data' flag") + var newTotalOffersInt int64 + if !flags.Changed("new_total_offers") { + log.Fatal("missing required 'new_total_offers' flag") } - if newSavedData, err = flags.GetInt64("new_saved_data"); err != nil { - log.Fatal("error in 'new_saved_data' flag: ", err) + if newTotalOffersInt, err = flags.GetInt64("new_total_offers"); err != nil { + log.Fatal("error in 'new_total_offers' flag: ", err) } + newTotalOffers = currency.Coin(newTotalOffersInt) resetBlobberStatsDto := &sdk.ResetBlobberStatsDto{ - BlobberID: blobberID, - PrevAllocated: prevAllocated, - PrevSavedData: prevSavedData, - NewAllocated: newAllocated, - NewSavedData: newSavedData, + BlobberID: blobberID, + PrevTotalOffers: prevTotalOffers, + NewTotalOffers: newTotalOffers, } fmt.Println(*resetBlobberStatsDto) @@ -396,9 +383,7 @@ func init() { resetBlobberStatsCmd.Flags().Int64("prev_saved_data", 0, "prev_saved_data is required") resetBlobberStatsCmd.Flags().Int64("new_allocated", 0, "new_allocated is required") resetBlobberStatsCmd.Flags().Int64("new_saved_data", 0, "new_saved_data is required") + resetBlobberStatsCmd.Flags().Int64("prev_total_offers", 0, "prev_total_offers is required") + resetBlobberStatsCmd.Flags().Int64("new_total_offers", 0, "new_total_offers is required") resetBlobberStatsCmd.MarkFlagRequired("blobber_id") - resetBlobberStatsCmd.MarkFlagRequired("prev_allocated") - resetBlobberStatsCmd.MarkFlagRequired("prev_saved_data") - resetBlobberStatsCmd.MarkFlagRequired("new_allocated") - resetBlobberStatsCmd.MarkFlagRequired("new_saved_data") } diff --git a/go.mod b/go.mod index 7eaa96d8..3c181e94 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,9 @@ module github.com/0chain/zboxcli go 1.21 require ( + github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565 github.com/0chain/errors v1.0.3 - github.com/0chain/gosdk v1.14.0 + github.com/0chain/gosdk v1.14.11-0.20240530195547-900bbc4132ce github.com/icza/bitio v1.1.0 github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/cobra v1.6.0 @@ -13,7 +14,6 @@ require ( ) require ( - github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565 // indirect github.com/Luzifer/go-openssl/v3 v3.1.0 // indirect github.com/andybalholm/brotli v1.0.5 // indirect github.com/btcsuite/btcd v0.23.4 // indirect @@ -33,7 +33,7 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/herumi/bls-go-binary v1.31.0 // indirect - github.com/hitenjain14/fasthttp v0.0.0-20240229173600-722723e15e17 // indirect + github.com/hitenjain14/fasthttp v0.0.0-20240527123209-06019e79bff9 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/klauspost/compress v1.17.0 // indirect github.com/klauspost/cpuid/v2 v2.2.4 // indirect diff --git a/go.sum b/go.sum index 7929c6c5..d6c5f688 100644 --- a/go.sum +++ b/go.sum @@ -40,8 +40,8 @@ github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565 h1:z+DtCR8mBsjPnEs github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565/go.mod h1:UyDC8Qyl5z9lGkCnf9RHJPMektnFX8XtCJZHXCCVj8E= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= -github.com/0chain/gosdk v1.14.0 h1:jmvfnPphIXQo8YQcRvEEvN7S+mBZQSURmmI7FsmL2YA= -github.com/0chain/gosdk v1.14.0/go.mod h1:tgAiVAuIy+Vs1tGfKCPEuuWWARwNQBEw32y950LrqrU= +github.com/0chain/gosdk v1.14.11-0.20240530195547-900bbc4132ce h1:Tm4Zq+FJuwP5uS96xrswzktW0u73oSJoeTeKGDV4mWo= +github.com/0chain/gosdk v1.14.11-0.20240530195547-900bbc4132ce/go.mod h1:Hzl56JJ66ZmoyNS7CbTJue7wUugBYvNx8/qJzTRWmkI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Luzifer/go-openssl/v3 v3.1.0 h1:QqKqo6kYXGGUsvtUoCpRZm8lHw+jDfhbzr36gVj+/gw= @@ -215,8 +215,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/herumi/bls-go-binary v1.31.0 h1:L1goQ2tMtGgpXCg5AwHAdJQpLs/pfnWWEc3Wog6OhmI= github.com/herumi/bls-go-binary v1.31.0/go.mod h1:O4Vp1AfR4raRGwFeQpr9X/PQtncEicMoOe6BQt1oX0Y= -github.com/hitenjain14/fasthttp v0.0.0-20240229173600-722723e15e17 h1:FbyIK0BfvXVZTOxKOe2dlxJqSPSF2ZXOv2Mc7dvS7sc= -github.com/hitenjain14/fasthttp v0.0.0-20240229173600-722723e15e17/go.mod h1:RZMcXy7u4S+E97IXYTe7WHZ3+mCYOh4vys8PkIGZeXk= +github.com/hitenjain14/fasthttp v0.0.0-20240527123209-06019e79bff9 h1:Z6Mu2JCsW2hbqx91L0HNPRPQ10RyAFvPocQHlrRo1Jk= +github.com/hitenjain14/fasthttp v0.0.0-20240527123209-06019e79bff9/go.mod h1:RZMcXy7u4S+E97IXYTe7WHZ3+mCYOh4vys8PkIGZeXk= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c h1:DZfsyhDK1hnSS5lH8l+JggqzEleHteTYfutAiVlSUM8=