Remove flag offset (cosmos#875)

* Remove flag offset * Correct example of command query txs Co-authored-by: shaneing <[email protected]>
Krezmona · Jul 29, 2022 · d7bb7dc · d7bb7dc
1 parent e1c8740
commit d7bb7dc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/cmd/flags.go b/cmd/flags.go
@@ -36,7 +36,6 @@ const (
 	flagVersion                 = "version"
 	flagDebugAddr               = "debug-addr"
 	flagOverwriteConfig         = "overwrite"
-	flagOffset                  = "offset"
 	flagLimit                   = "limit"
 	flagHeight                  = "height"
 	flagPage                    = "page"
@@ -73,7 +72,6 @@ func heightFlag(v *viper.Viper, cmd *cobra.Command) *cobra.Command {
 func paginationFlags(v *viper.Viper, cmd *cobra.Command, query string) *cobra.Command {
 	cmd.Flags().Uint64(flagPage, 1, fmt.Sprintf("pagination page of %s to query for. This sets offset to a multiple of limit", query))
 	cmd.Flags().String(flagPageKey, "", fmt.Sprintf("pagination page-key of %s to query for", query))
-	cmd.Flags().Uint64(flagOffset, 0, fmt.Sprintf("pagination offset of %s to query for", query))
 	cmd.Flags().Uint64(flagLimit, 100, fmt.Sprintf("pagination limit of %s to query for", query))
 	cmd.Flags().Bool(flagCountTotal, false, fmt.Sprintf("count total number of records in %s to query for", query))
 	cmd.Flags().Bool(flagReverse, false, "results are sorted in descending order")
@@ -84,9 +82,6 @@ func paginationFlags(v *viper.Viper, cmd *cobra.Command, query string) *cobra.Co
 	if err := v.BindPFlag(flagPageKey, cmd.Flags().Lookup(flagPageKey)); err != nil {
 		panic(err)
 	}
-	if err := v.BindPFlag(flagOffset, cmd.Flags().Lookup(flagOffset)); err != nil {
-		panic(err)
-	}
 	if err := v.BindPFlag(flagLimit, cmd.Flags().Lookup(flagLimit)); err != nil {
 		panic(err)
 	}

diff --git a/cmd/flags_test.go b/cmd/flags_test.go
@@ -12,7 +12,6 @@ import (
 // This allows us to avoid directly depending on the `sdk/client/flags` package inside of our cmd package.
 func TestFlagEqualityAgainstSDK(t *testing.T) {
 	require.Equal(t, flagHome, flags.FlagHome)
-	require.Equal(t, flagOffset, flags.FlagOffset)
 	require.Equal(t, flagLimit, flags.FlagLimit)
 	require.Equal(t, flagHeight, flags.FlagHeight)
 	require.Equal(t, flagPage, flags.FlagPage)

diff --git a/cmd/query.go b/cmd/query.go
@@ -161,7 +161,7 @@ documents its respective events under 'cosmos-sdk/x/{module}/spec/xx_events.md'.
 		),
 		Args: withUsage(cobra.ExactArgs(2)),
 		Example: strings.TrimSpace(fmt.Sprintf(`
-$ %s query txs ibc-0 "message.action=transfer" --offset 1 --limit 10
+$ %s query txs ibc-0 "message.action=transfer" --page 1 --limit 10
 $ %s q txs ibc-0 "message.action=transfer"`,
 			appName, appName,
 		)),
@@ -171,7 +171,7 @@ $ %s q txs ibc-0 "message.action=transfer"`,
 				return errChainNotFound(args[0])
 			}
 
-			offset, err := cmd.Flags().GetUint64(flagOffset)
+			page, err := cmd.Flags().GetUint64(flagPage)
 			if err != nil {
 				return err
 			}
@@ -181,7 +181,7 @@ $ %s q txs ibc-0 "message.action=transfer"`,
 				return err
 			}
 
-			txs, err := chain.ChainProvider.QueryTxs(cmd.Context(), int(offset), int(limit), []string{args[1]})
+			txs, err := chain.ChainProvider.QueryTxs(cmd.Context(), int(page), int(limit), []string{args[1]})
 			if err != nil {
 				return err
 			}