chore!: var-naming linter errors

CHANGELOG.md

@@ -50,6 +50,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (x/staking) [#12102](https://github.com/cosmos/cosmos-sdk/pull/12102) Staking keeper now is passed by reference instead of copy. Keeper's SetHooks no longer returns keeper. It updates the keeper in place instead.
 
 ### Bug Fixes
+
+* (linting) [#12135](https://github.com/cosmos/cosmos-sdk/pull/12135/) Fix variable naming issues per enabled linters. Run gofumpt to ensure easy reviews of ongoing linting work. 
 * (linting) [#12132](https://github.com/cosmos/cosmos-sdk/pull/12132) Change sdk.Int to math.Int, run `gofumpt -w -l .`, and `golangci-lint run ./... --fix`
 * (cli) [#12127](https://github.com/cosmos/cosmos-sdk/pull/12127) Fix the CLI not always taking into account `--fee-payer` and `--fee-granter` flags.
 * (migrations) [#12028](https://github.com/cosmos/cosmos-sdk/pull/12028) Fix v0.45->v0.46 in-place store migrations.

x/auth/tx/service.go

@@ -181,7 +181,7 @@ func (s txServer) GetBlockWithTxs(ctx context.Context, req *txtypes.GetBlockWith
  "or greater than the current height %d", req.Height, currentHeight)
  }
 
- blockId, block, err := tmservice.GetProtoBlock(ctx, s.clientCtx, &req.Height)
+ blockID, block, err := tmservice.GetProtoBlock(ctx, s.clientCtx, &req.Height)
  if err != nil {
  return nil, err
  }
@@ -230,7 +230,7 @@ func (s txServer) GetBlockWithTxs(ctx context.Context, req *txtypes.GetBlockWith
 
  return &txtypes.GetBlockWithTxsResponse{
  Txs: txs,
- BlockId: &blockId,
+ BlockId: &blockID,
  Block: block,
  Pagination: &pagination.PageResponse{
  Total: blockTxsLn,

x/authz/keeper/keeper.go

@@ -323,10 +323,10 @@ func (keeper Keeper) removeFromGrantQueue(ctx sdk.Context, grantKey []byte, gran
  _, _, msgType := parseGrantStoreKey(grantKey)
  queueItems := queueItem.MsgTypeUrls
 
- for index, typeUrl := range queueItems {
+ for index, typeURL := range queueItems {
  ctx.GasMeter().ConsumeGas(gasCostPerIteration, "grant queue")
 
- if typeUrl == msgType {
+ if typeURL == msgType {
  end := len(queueItem.MsgTypeUrls) - 1
  queueItems[index] = queueItems[end]
  queueItems = queueItems[:end]
@@ -363,8 +363,8 @@ func (k Keeper) DequeueAndDeleteExpiredGrants(ctx sdk.Context) error {
 
  store.Delete(iterator.Key())
 
- for _, typeUrl := range queueItem.MsgTypeUrls {
- store.Delete(grantStoreKey(grantee, granter, typeUrl))
+ for _, typeURL := range queueItem.MsgTypeUrls {
+ store.Delete(grantStoreKey(grantee, granter, typeURL))
  }
  }
 

x/group/keeper/grpc_query.go

@@ -321,9 +321,9 @@ func (k Keeper) getVotesByVoter(ctx sdk.Context, voter sdk.AccAddress, pageReque
 // TallyResult computes the live tally result of a proposal.
 func (k Keeper) TallyResult(goCtx context.Context, request *group.QueryTallyResultRequest) (*group.QueryTallyResultResponse, error) {
  ctx := sdk.UnwrapSDKContext(goCtx)
- proposalId := request.ProposalId
+ proposalID := request.ProposalId
 
- proposal, err := k.getProposal(ctx, proposalId)
+ proposal, err := k.getProposal(ctx, proposalID)
  if err != nil {
  return nil, err
  }

x/group/keeper/keeper.go

@@ -369,12 +369,12 @@ func (k Keeper) TallyProposalsAtVPEnd(ctx sdk.Context) error {
  return true, sdkerrors.Wrap(err, "group")
  }
 
- proposalId := proposal.Id
+ proposalID := proposal.Id
  if proposal.Status == group.PROPOSAL_STATUS_ABORTED || proposal.Status == group.PROPOSAL_STATUS_WITHDRAWN {
- if err := k.pruneProposal(ctx, proposalId); err != nil {
+ if err := k.pruneProposal(ctx, proposalID); err != nil {
  return true, err
  }
- if err := k.pruneVotes(ctx, proposalId); err != nil {
+ if err := k.pruneVotes(ctx, proposalID); err != nil {
  return true, err
  }
  } else {

x/group/keeper/msg_server.go

@@ -248,12 +248,12 @@ func (k Keeper) CreateGroupWithPolicy(goCtx context.Context, req *group.MsgCreat
  if err != nil {
  return nil, sdkerrors.Wrap(err, "group response")
  }
- groupId := groupRes.GroupId
+ groupID := groupRes.GroupId
 
  var groupPolicyAddr sdk.AccAddress
  groupPolicyRes, err := k.CreateGroupPolicy(goCtx, &group.MsgCreateGroupPolicy{
  Admin: req.Admin,
- GroupId: groupId,
+ GroupId: groupID,
  Metadata: req.GroupPolicyMetadata,
  DecisionPolicy: req.DecisionPolicy,
  })
@@ -270,7 +270,7 @@ func (k Keeper) CreateGroupWithPolicy(goCtx context.Context, req *group.MsgCreat
 
  if req.GroupPolicyAsAdmin {
  updateAdminReq := &group.MsgUpdateGroupAdmin{
- GroupId: groupId,
+ GroupId: groupID,
  Admin: req.Admin,
  NewAdmin: groupPolicyAddress,
  }
@@ -290,7 +290,7 @@ func (k Keeper) CreateGroupWithPolicy(goCtx context.Context, req *group.MsgCreat
  }
  }
 
- return &group.MsgCreateGroupWithPolicyResponse{GroupId: groupId, GroupPolicyAddress: groupPolicyAddress}, nil
+ return &group.MsgCreateGroupWithPolicyResponse{GroupId: groupID, GroupPolicyAddress: groupPolicyAddress}, nil
 }
 
 func (k Keeper) CreateGroupPolicy(goCtx context.Context, req *group.MsgCreateGroupPolicy) (*group.MsgCreateGroupPolicyResponse, error) {

x/group/keeper/tally.go

@@ -10,7 +10,7 @@ import (
 
 // Tally is a function that tallies a proposal by iterating through its votes,
 // and returns the tally result without modifying the proposal or any state.
-func (k Keeper) Tally(ctx sdk.Context, p group.Proposal, groupId uint64) (group.TallyResult, error) {
+func (k Keeper) Tally(ctx sdk.Context, p group.Proposal, groupID uint64) (group.TallyResult, error) {
  // If proposal has already been tallied and updated, then its status is
  // accepted/rejected, in which case we just return the previously stored result.
  //
@@ -40,7 +40,7 @@ func (k Keeper) Tally(ctx sdk.Context, p group.Proposal, groupId uint64) (group.
 
  var member group.GroupMember
  err := k.groupMemberTable.GetOne(ctx.KVStore(k.key), orm.PrimaryKey(&group.GroupMember{
- GroupId: groupId,
+ GroupId: groupID,
  Member: &group.Member{Address: vote.Voter},
  }), &member)