fix format

Author: RogerKSI

proto/restake/v1beta1/tx.proto

@@ -18,7 +18,7 @@ message MsgClaimRewards {
   option (cosmos.msg.v1.signer) = "locker_address";
   option (amino.name)           = "restake/MsgClaimRewards";
 
-  // lockerAddress is the address that will claim the rewards.
+  // locker_address is the address that will claim the rewards.
   string locker_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 
   // key is the key that want to claim rewards from.

x/restake/client/cli/query.go

@@ -21,33 +21,37 @@ func GetQueryCmd() *cobra.Command {
 	}
 
 	queryCmd.AddCommand(
-		GetQueryCmdKey(),
 		GetQueryCmdKeys(),
+		GetQueryCmdKey(),
 		GetQueryCmdRewards(),
 		GetQueryCmdReward(),
-		GetQueryCmdLocks(),
 		GetQueryCmdLock(),
+		GetQueryCmdLocks(),
 	)
 
 	return queryCmd
 }
 
-// GetQueryCmdKey implements the key query command.
-func GetQueryCmdKey() *cobra.Command {
+// GetQueryCmdKeys implements the keys query command.
+func GetQueryCmdKeys() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "key [name]",
-		Short: "shows information of the key",
-		Args:  cobra.ExactArgs(1),
+		Use:   "keys",
+		Short: "shows all keys",
+		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
 			queryClient := types.NewQueryClient(clientCtx)
 
-			res, err := queryClient.Key(
-				context.Background(),
-				&types.QueryKeyRequest{
-					Key: args[0],
-				},
-			)
+			pageReq, err := client.ReadPageRequest(cmd.Flags())
+			if err != nil {
+				return err
+			}
+
+			res, err := queryClient.Keys(context.Background(), &types.QueryKeysRequest{Pagination: pageReq})
 			if err != nil {
 				return err
 			}
@@ -56,27 +60,32 @@ func GetQueryCmdKey() *cobra.Command {
 		},
 	}
 
+	flags.AddPaginationFlagsToCmd(cmd, "keys")
 	flags.AddQueryFlagsToCmd(cmd)
 
 	return cmd
 }
 
-// GetQueryCmdKeys implements the keys query command.
-func GetQueryCmdKeys() *cobra.Command {
+// GetQueryCmdKey implements the key query command.
+func GetQueryCmdKey() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "keys",
-		Short: "shows all keys",
-		Args:  cobra.NoArgs,
+		Use:   "key [name]",
+		Short: "shows information of the key",
+		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
-			queryClient := types.NewQueryClient(clientCtx)
-
-			pageReq, err := client.ReadPageRequest(cmd.Flags())
+			clientCtx, err := client.GetClientQueryContext(cmd)
 			if err != nil {
 				return err
 			}
 
-			res, err := queryClient.Keys(context.Background(), &types.QueryKeysRequest{Pagination: pageReq})
+			queryClient := types.NewQueryClient(clientCtx)
+
+			res, err := queryClient.Key(
+				context.Background(),
+				&types.QueryKeyRequest{
+					Key: args[0],
+				},
+			)
 			if err != nil {
 				return err
 			}
@@ -85,7 +94,6 @@ func GetQueryCmdKeys() *cobra.Command {
 		},
 	}
 
-	flags.AddPaginationFlagsToCmd(cmd, "keys")
 	flags.AddQueryFlagsToCmd(cmd)
 
 	return cmd
@@ -98,11 +106,21 @@ func GetQueryCmdRewards() *cobra.Command {
 		Short: "shows all rewards of an address",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
 			queryClient := types.NewQueryClient(clientCtx)
 
+			pageReq, err := client.ReadPageRequest(cmd.Flags())
+			if err != nil {
+				return err
+			}
+
 			res, err := queryClient.Rewards(context.Background(), &types.QueryRewardsRequest{
 				LockerAddress: args[0],
+				Pagination:    pageReq,
 			})
 			if err != nil {
 				return err
@@ -125,7 +143,11 @@ func GetQueryCmdReward() *cobra.Command {
 		Short: "shows the reward of an locker address for the key",
 		Args:  cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
 			queryClient := types.NewQueryClient(clientCtx)
 
 			res, err := queryClient.Reward(context.Background(), &types.QueryRewardRequest{
@@ -152,11 +174,21 @@ func GetQueryCmdLocks() *cobra.Command {
 		Short: "shows all locks of an locker address",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
 			queryClient := types.NewQueryClient(clientCtx)
 
+			pageReq, err := client.ReadPageRequest(cmd.Flags())
+			if err != nil {
+				return err
+			}
+
 			res, err := queryClient.Locks(context.Background(), &types.QueryLocksRequest{
 				LockerAddress: args[0],
+				Pagination:    pageReq,
 			})
 			if err != nil {
 				return err
@@ -179,7 +211,11 @@ func GetQueryCmdLock() *cobra.Command {
 		Short: "shows the lock of an locker address for the key",
 		Args:  cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
 			queryClient := types.NewQueryClient(clientCtx)
 
 			res, err := queryClient.Lock(context.Background(), &types.QueryLockRequest{

x/restake/keeper/grpc_query.go

@@ -71,11 +71,11 @@ func (k Querier) Rewards(
 		return nil, err
 	}
 
-	keyStore := prefix.NewStore(ctx.KVStore(k.storeKey), types.LocksByAddressStoreKey(addr))
+	lockStore := prefix.NewStore(ctx.KVStore(k.storeKey), types.LocksByAddressStoreKey(addr))
 
 	filteredRewards, pageRes, err := query.GenericFilteredPaginate(
 		k.cdc,
-		keyStore,
+		lockStore,
 		req.Pagination,
 		func(key []byte, s *types.Lock) (*types.Reward, error) {
 			reward := k.getReward(ctx, *s)
@@ -124,11 +124,11 @@ func (k Querier) Locks(
 		return nil, err
 	}
 
-	keyStore := prefix.NewStore(ctx.KVStore(k.storeKey), types.LocksByAddressStoreKey(addr))
+	lockStore := prefix.NewStore(ctx.KVStore(k.storeKey), types.LocksByAddressStoreKey(addr))
 
 	filteredLocks, pageRes, err := query.GenericFilteredPaginate(
 		k.cdc,
-		keyStore,
+		lockStore,
 		req.Pagination,
 		func(key []byte, s *types.Lock) (*types.LockResponse, error) {
 			if !k.IsActiveKey(ctx, s.Key) || s.Amount.IsZero() {

x/restake/types/msgs.go

@@ -2,6 +2,7 @@ package types
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 var _ sdk.Msg = &MsgClaimRewards{}
@@ -36,9 +37,8 @@ func (m MsgClaimRewards) GetSignBytes() []byte {
 
 // ValidateBasic implements the sdk.Msg interface.
 func (m MsgClaimRewards) ValidateBasic() error {
-	_, err := sdk.AccAddressFromBech32(m.LockerAddress)
-	if err != nil {
-		return err
+	if _, err := sdk.AccAddressFromBech32(m.LockerAddress); err != nil {
+		return sdkerrors.ErrInvalidAddress.Wrapf("invalid locker address: %s", err)
 	}
 
 	if len(m.Key) == 0 {