LaconicNetwork/cosmos-sdk
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

chore: fix all lint issue since golangci-lint bump (#21326)

Browse Source
This commit is contained in:
Julien Robert 2024-08-16 15:03:24 +02:00 committed by GitHub
parent 825e81b688
commit 6276b015bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
20 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/lint.yml vendored
View File

@ -24,6 +24,7 @@ jobs:
id: git_diff
with:
PATTERNS: |
**/*.mk
Makefile
**/Makefile
.golangci.yml

4
client/v2/autocli/keyring/keyring.go
View File

@ -10,7 +10,9 @@ import (
// KeyringContextKey is the key used to store the keyring in the context.
// The keyring must be wrapped using the KeyringImpl.
var KeyringContextKey struct{}
var KeyringContextKey keyringContextKey
type keyringContextKey struct{}
var _ Keyring = &KeyringImpl{}

4
log/CHANGELOG.md
View File

@ -22,6 +22,10 @@ Each entry must include the Github issue reference in the following format:
## [Unreleased]
## [v1.4.1](https://github.com/cosmos/cosmos-sdk/releases/tag/log/v1.4.1) - 2024-08-16
* [#21326](https://github.com/cosmos/cosmos-sdk/pull/21326) Avoid context key collision.
## [v1.4.0](https://github.com/cosmos/cosmos-sdk/releases/tag/log/v1.4.0) - 2024-08-07
* [#21045](https://github.com/cosmos/cosmos-sdk/pull/21045) Add `WithContext` method implementations to make all returned loggers compatible with `cosmossdk.io/core/log.Logger` (v1) without a direct dependency.

4
log/logger.go
View File

@ -30,7 +30,9 @@ func init() {
const ModuleKey = "module"
// ContextKey is used to store the logger in the context.
var ContextKey struct{}
var ContextKey contextKey
type contextKey struct{}
// Logger is the Cosmos SDK logger interface.
// It extends cosmossdk.io/core/log.Logger to return a child logger.

2
simapp/simd/cmd/root_di.go
View File

@ -19,10 +19,10 @@ import (
"cosmossdk.io/x/auth/tx"
authtxconfig "cosmossdk.io/x/auth/tx/config"
"cosmossdk.io/x/auth/types"
nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/config"
nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/server"

2
tests/integration/slashing/slashing_test.go
View File

@ -114,5 +114,5 @@ func TestSlashingMsgs(t *testing.T) {
headerInfo = header.Info{Height: app.LastBlockHeight() + 1}
_, _, err = sims.SignCheckDeliver(t, txConfig, app.BaseApp, headerInfo, []sdk.Msg{unjailMsg}, "", []uint64{0}, []uint64{1}, false, false, priv1)
require.Error(t, err)
require.True(t, errors.Is(types.ErrValidatorNotJailed, err))
require.True(t, errors.Is(err, types.ErrValidatorNotJailed))
}

2
tests/systemtests/system.go
View File

@ -247,7 +247,7 @@ func (s *SystemUnderTest) AwaitUpgradeInfo(t *testing.T) {
case err == nil:
found = true
case !os.IsNotExist(err):
t.Fatalf(err.Error())
t.Fatal(err.Error())
}
})
time.Sleep(s.blockTime / 2)

2
tools/cosmovisor/cmd/cosmovisor/version_test.go
View File

@ -20,7 +20,7 @@ func TestVersionCommand_Error(t *testing.T) {
rootCmd.SetOut(out)
rootCmd.SetErr(out)
ctx := context.WithValue(context.Background(), log.ContextKey, logger)
ctx := context.WithValue(context.Background(), log.ContextKey, logger) //nolint:staticcheck // temporary issue in dependency
require.Error(t, rootCmd.ExecuteContext(ctx))
require.Contains(t, out.String(), "DAEMON_NAME is not set")

8
x/auth/keeper/grpc_query.go
View File

@ -86,7 +86,7 @@ func (s queryServer) Account(ctx context.Context, req *types.QueryAccountRequest
any, err := codectypes.NewAnyWithValue(account)
if err != nil {
return nil, status.Errorf(codes.Internal, err.Error())
return nil, status.Error(codes.Internal, err.Error())
}
return &types.QueryAccountResponse{Account: any}, nil
@ -124,7 +124,7 @@ func (s queryServer) ModuleAccounts(ctx context.Context, req *types.QueryModuleA
}
any, err := codectypes.NewAnyWithValue(account)
if err != nil {
return nil, status.Errorf(codes.Internal, err.Error())
return nil, status.Error(codes.Internal, err.Error())
}
modAccounts = append(modAccounts, any)
}
@ -150,7 +150,7 @@ func (s queryServer) ModuleAccountByName(ctx context.Context, req *types.QueryMo
}
any, err := codectypes.NewAnyWithValue(account)
if err != nil {
return nil, status.Errorf(codes.Internal, err.Error())
return nil, status.Error(codes.Internal, err.Error())
}
return &types.QueryModuleAccountByNameResponse{Account: any}, nil
@ -234,7 +234,7 @@ func (s queryServer) AccountInfo(ctx context.Context, req *types.QueryAccountInf
if pubKey != nil {
pkAny, err = codectypes.NewAnyWithValue(account.GetPubKey())
if err != nil {
return nil, status.Errorf(codes.Internal, err.Error())
return nil, status.Error(codes.Internal, err.Error())
}
}

8
x/authz/keeper/grpc_query.go
View File

@ -48,7 +48,7 @@ func (k Keeper) Grants(ctx context.Context, req *authz.QueryGrantsRequest) (*aut
authorizationAny, err := codectypes.NewAnyWithValue(authorization)
if err != nil {
return nil, status.Errorf(codes.Internal, err.Error())
return nil, status.Error(codes.Internal, err.Error())
}
return &authz.QueryGrantsResponse{
Grants: []*authz.Grant{{
@ -70,7 +70,7 @@ func (k Keeper) Grants(ctx context.Context, req *authz.QueryGrantsRequest) (*aut
authorizationAny, err := codectypes.NewAnyWithValue(auth1)
if err != nil {
return nil, status.Errorf(codes.Internal, err.Error())
return nil, status.Error(codes.Internal, err.Error())
}
return &authz.Grant{
Authorization: authorizationAny,
@ -111,7 +111,7 @@ func (k Keeper) GranterGrants(ctx context.Context, req *authz.QueryGranterGrants
any, err := codectypes.NewAnyWithValue(auth1)
if err != nil {
return nil, status.Errorf(codes.Internal, err.Error())
return nil, status.Error(codes.Internal, err.Error())
}
grantee := firstAddressFromGrantStoreKey(key)
@ -166,7 +166,7 @@ func (k Keeper) GranteeGrants(ctx context.Context, req *authz.QueryGranteeGrants
authorizationAny, err := codectypes.NewAnyWithValue(auth1)
if err != nil {
return nil, status.Errorf(codes.Internal, err.Error())
return nil, status.Error(codes.Internal, err.Error())
}
granterAddr, err := k.authKeeper.AddressCodec().BytesToString(granter)

4
x/distribution/keeper/grpc_query.go
View File

@ -119,7 +119,7 @@ func (k Querier) ValidatorOutstandingRewards(ctx context.Context, req *types.Que
}
if validator == nil {
return nil, errors.Wrapf(types.ErrNoValidatorExists, req.ValidatorAddress)
return nil, errors.Wrap(types.ErrNoValidatorExists, req.ValidatorAddress)
}
rewards, err := k.Keeper.ValidatorOutstandingRewards.Get(ctx, valAdr)
@ -151,7 +151,7 @@ func (k Querier) ValidatorCommission(ctx context.Context, req *types.QueryValida
}
if validator == nil {
return nil, errors.Wrapf(types.ErrNoValidatorExists, req.ValidatorAddress)
return nil, errors.Wrap(types.ErrNoValidatorExists, req.ValidatorAddress)
}
commission, err := k.ValidatorsAccumulatedCommission.Get(ctx, valAdr)
if err != nil && !errors.IsOf(err, collections.ErrNotFound) {

2
x/distribution/keeper/msg_server.go
View File

@ -189,7 +189,7 @@ func (k msgServer) DepositValidatorRewardsPool(ctx context.Context, msg *types.M
}
if validator == nil {
return nil, errors.Wrapf(types.ErrNoValidatorExists, msg.ValidatorAddress)
return nil, errors.Wrap(types.ErrNoValidatorExists, msg.ValidatorAddress)
}
// Allocate tokens from the distribution module to the validator, which are

2
x/evidence/keeper/grpc_query.go
View File

@ -53,7 +53,7 @@ func (k Querier) Evidence(ctx context.Context, req *types.QueryEvidenceRequest)
evidenceAny, err := codectypes.NewAnyWithValue(msg)
if err != nil {
return nil, status.Errorf(codes.Internal, err.Error())
return nil, status.Error(codes.Internal, err.Error())
}
return &types.QueryEvidenceResponse{Evidence: evidenceAny}, nil

4
x/feegrant/keeper/grpc_query.go
View File

@ -35,7 +35,7 @@ func (q Keeper) Allowance(ctx context.Context, req *feegrant.QueryAllowanceReque
feeAllowance, err := q.GetAllowance(ctx, granterAddr, granteeAddr)
if err != nil {
return nil, status.Errorf(codes.Internal, err.Error())
return nil, status.Error(codes.Internal, err.Error())
}
msg, ok := feeAllowance.(proto.Message)
@ -45,7 +45,7 @@ func (q Keeper) Allowance(ctx context.Context, req *feegrant.QueryAllowanceReque
feeAllowanceAny, err := codectypes.NewAnyWithValue(msg)
if err != nil {
return nil, status.Errorf(codes.Internal, err.Error())
return nil, status.Error(codes.Internal, err.Error())
}
return &feegrant.QueryAllowanceResponse{

2
x/gov/keeper/msg_server.go
View File

@ -383,7 +383,7 @@ func (k msgServer) SudoExec(ctx context.Context, msg *v1.MsgSudoExec) (*v1.MsgSu
if err := k.BranchService.Execute(ctx, func(ctx context.Context) error {
// TODO add route check here
if err := k.MsgRouterService.CanInvoke(ctx, sdk.MsgTypeURL(sudoedMsg)); err != nil {
return errors.Wrapf(govtypes.ErrInvalidProposal, err.Error())
return errors.Wrap(govtypes.ErrInvalidProposal, err.Error())
}
msgResp, err = k.MsgRouterService.InvokeUntyped(ctx, sudoedMsg)

4
x/gov/keeper/proposal.go
View File

@ -83,9 +83,9 @@ func (k Keeper) SubmitProposal(ctx context.Context, messages []sdk.Msg, metadata
if !bytes.Equal(signers[0], k.GetGovernanceAccount(ctx).GetAddress()) {
addr, err := k.authKeeper.AddressCodec().BytesToString(signers[0])
if err != nil {
return v1.Proposal{}, errorsmod.Wrapf(types.ErrInvalidSigner, err.Error())
return v1.Proposal{}, errorsmod.Wrap(types.ErrInvalidSigner, err.Error())
}
return v1.Proposal{}, errorsmod.Wrapf(types.ErrInvalidSigner, addr)
return v1.Proposal{}, errorsmod.Wrap(types.ErrInvalidSigner, addr)
}
if err := k.MsgRouterService.CanInvoke(ctx, sdk.MsgTypeURL(msg)); err != nil {

2
x/group/client/cli/tx.go
View File

@ -498,7 +498,7 @@ metadata example:
// Since the --from flag is not required on this CLI command, we
// ignore it, and just use the 1st proposer in the JSON file.
if prop.Proposers == nil || len(prop.Proposers) == 0 {
if len(prop.Proposers) == 0 {
return errors.New("no proposers specified in proposal")
}
err = cmd.Flags().Set(flags.FlagFrom, prop.Proposers[0])

2
x/group/keeper/keeper.go
View File

@ -455,7 +455,7 @@ func (k Keeper) TallyProposalsAtVPEnd(ctx context.Context) error {
// is greater than defined MaxMetadataLen in the module configuration
func (k Keeper) assertMetadataLength(metadata, description string) error {
if uint64(len(metadata)) > k.config.MaxMetadataLen {
return errors.ErrMetadataTooLong.Wrapf(description)
return errors.ErrMetadataTooLong.Wrap(description)
}
return nil
}

2
x/slashing/keeper/signing_info.go
View File

@ -31,7 +31,7 @@ func (k Keeper) JailUntil(ctx context.Context, consAddr sdk.ConsAddress, jailTim
if err != nil {
return types.ErrNoSigningInfoFound.Wrapf("could not convert consensus address to string. Error: %s", err.Error())
}
return types.ErrNoSigningInfoFound.Wrapf(fmt.Sprintf("cannot jail validator with consensus address %s that does not have any signing information", addr))
return types.ErrNoSigningInfoFound.Wrapf("cannot jail validator with consensus address %s that does not have any signing information", addr)
}
signInfo.JailedUntil = jailTime

4
x/upgrade/keeper/abci_test.go
View File

@ -148,7 +148,7 @@ func TestRequireFutureBlock(t *testing.T) {
s := setupTest(t, 10, map[int64]bool{})
err := s.keeper.ScheduleUpgrade(s.ctx, types.Plan{Name: "test", Height: s.ctx.HeaderInfo().Height - 1})
require.Error(t, err)
require.True(t, errors.Is(sdkerrors.ErrInvalidRequest, err), err)
require.True(t, errors.Is(err, sdkerrors.ErrInvalidRequest), err)
}
func TestDoHeightUpgrade(t *testing.T) {
@ -223,7 +223,7 @@ func TestCantApplySameUpgradeTwice(t *testing.T) {
t.Log("Verify an executed upgrade \"test\" can't be rescheduled")
err = s.keeper.ScheduleUpgrade(s.ctx, types.Plan{Name: "test", Height: height})
require.Error(t, err)
require.True(t, errors.Is(sdkerrors.ErrInvalidRequest, err), err)
require.True(t, errors.Is(err, sdkerrors.ErrInvalidRequest), err)
}
func TestNoSpuriousUpgrades(t *testing.T) {