diff --git a/.golangci.yml b/.golangci.yml index f237a48ed5..a80041c273 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,26 +1,22 @@ +version: "2" run: - tests: true - timeout: 15m - allow-parallel-runners: true build-tags: - e2e - ledger - test_ledger_mock - sims - + tests: true + allow-parallel-runners: true linters: - disable-all: true + default: none enable: + - copyloopvar - dogsled - errcheck - errorlint - - copyloopvar - - gci - goconst - gocritic - - gofumpt - gosec - - gosimple - govet - ineffassign - misspell @@ -28,99 +24,121 @@ linters: - nolintlint - revive - staticcheck - - stylecheck - thelper - - typecheck - unconvert - unused - + settings: + dogsled: + max-blank-identifiers: 6 + gocritic: + disabled-checks: + - regexpMust + - appendAssign + - ifElseChain + gosec: + excludes: + - G101 + - G107 + - G404 + confidence: medium + misspell: + locale: US + nolintlint: + require-explanation: true + require-specific: false + allow-unused: false + revive: + rules: + - name: redefines-builtin-id + disabled: true + staticcheck: + checks: + - all + unused: + local-variables-are-used: false + exclusions: + generated: lax + presets: + - comments + - common-false-positives + - legacy + - std-error-handling + rules: + - linters: + - staticcheck + text: 'ST1003:' + - linters: + - staticcheck + text: 'ST1016:' + - linters: + - staticcheck + path: migrations + text: 'SA1019:' + - linters: + - staticcheck + text: 'SA1019: codec.NewAminoCodec is deprecated' + - linters: + - staticcheck + text: 'SA1019: legacybech32.MustMarshalPubKey' + - linters: + - staticcheck + text: 'SA1019: legacybech32.MarshalPubKey' + - linters: + - staticcheck + text: 'SA1019: legacybech32.UnmarshalPubKey' + - linters: + - staticcheck + text: 'SA1019: params.SendEnabled is deprecated' + - linters: + - gosec + text: 'G115: integer overflow conversion' + - linters: + - nolintlint + text: leading space + paths: + - server/grpc/gogoreflection/fix_registration.go + - fix_registration.go + - .*\.pb\.go$ + - .*\.pb\.gw\.go$ + - .*\.pulsar\.go$ + - crypto/keys/secp256k1/internal/* + - types/coin_regex.go + - testutil/testdata + - x/params + - x/crisis + - third_party$ + - builtin$ + - examples$ issues: - exclude-dirs: - - testutil/testdata - - x/params - - x/crisis - exclude-files: - - server/grpc/gogoreflection/fix_registration.go - - "fix_registration.go" - - ".*\\.pb\\.go$" - - ".*\\.pb\\.gw\\.go$" - - ".*\\.pulsar\\.go$" - - crypto/keys/secp256k1/internal/* - - types/coin_regex.go - exclude-rules: - - text: "ST1003:" # We are fine with our current naming - linters: - - stylecheck - # FIXME: Disabled until golangci-lint updates stylecheck with this fix: - # https://github.com/dominikh/go-tools/issues/389 - - text: "ST1016:" # Ok with inconsistent receiver names - linters: - - stylecheck - - path: "migrations" # migraitions always use deprecated code - text: "SA1019:" - linters: - - staticcheck - - text: "SA1019: codec.NewAminoCodec is deprecated" # TODO remove once migration path is set out - linters: - - staticcheck - - text: "SA1019: legacybech32.MustMarshalPubKey" # TODO remove once ready to remove from the sdk - linters: - - staticcheck - - text: "SA1019: legacybech32.MarshalPubKey" # TODO remove once ready to remove from the sdk - linters: - - staticcheck - - text: "SA1019: legacybech32.UnmarshalPubKey" # TODO remove once ready to remove from the sdk - linters: - - staticcheck - - text: "SA1019: params.SendEnabled is deprecated" # TODO remove once ready to remove from the sdk - linters: - - staticcheck - - text: "G115: integer overflow conversion" # We are doing this everywhere. - linters: - - gosec - - text: "leading space" - linters: - - nolintlint max-issues-per-linter: 10000 max-same-issues: 10000 - -linters-settings: - gci: - custom-order: true - sections: - - standard # Standard section: captures all standard packages. - - default # Default section: contains all imports that could not be matched to another section type. - - prefix(cosmossdk.io) - - prefix(github.com/cosmos/cosmos-sdk) - revive: - rules: - - name: redefines-builtin-id - disabled: true - - gosec: - # Available rules: https://github.com/securego/gosec#available-rules - excludes: - - G101 # Potential hardcoded credentials - - G107 # Potential HTTP request made with variable url - - G404 # Use of weak random number generator (math/rand instead of crypto/rand) - exclude-generated: true - confidence: medium - misspell: - locale: US - gofumpt: - extra-rules: true - dogsled: - max-blank-identifiers: 6 - nolintlint: - allow-unused: false - require-explanation: true - require-specific: false - gosimple: - checks: ["all"] - gocritic: - disabled-checks: - - regexpMust - - appendAssign - - ifElseChain - unused: - local-variables-are-used: false \ No newline at end of file +formatters: + enable: + - gci + - gofumpt + settings: + gci: + sections: + - standard + - default + - prefix(cosmossdk.io) + - prefix(github.com/cosmos/cosmos-sdk) + custom-order: true + gofumpt: + extra-rules: true + exclusions: + generated: lax + paths: + - server/grpc/gogoreflection/fix_registration.go + - fix_registration.go + - .*\.pb\.go$ + - .*\.pb\.gw\.go$ + - .*\.pulsar\.go$ + - crypto/keys/secp256k1/internal/* + - types/coin_regex.go + - testutil/testdata + - x/params + - x/crisis + - third_party$ + - builtin$ + - examples$ diff --git a/Makefile b/Makefile index 25f8e34604..dfa63fad0e 100644 --- a/Makefile +++ b/Makefile @@ -382,11 +382,11 @@ benchmark: ### Linting ### ############################################################################### -golangci_version=v1.64.8 +golangci_version=v2.0.0 lint-install: @echo "--> Installing golangci-lint $(golangci_version)" - @go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version) + @go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(golangci_version) lint: @echo "--> Running linter on all files" diff --git a/baseapp/abci.go b/baseapp/abci.go index 64796076e0..42f1d81e6b 100644 --- a/baseapp/abci.go +++ b/baseapp/abci.go @@ -340,11 +340,11 @@ func (app *BaseApp) ApplySnapshotChunk(req *abci.RequestApplySnapshotChunk) (*ab func (app *BaseApp) CheckTx(req *abci.RequestCheckTx) (*abci.ResponseCheckTx, error) { var mode execMode - switch { - case req.Type == abci.CheckTxType_New: + switch req.Type { + case abci.CheckTxType_New: mode = execModeCheck - case req.Type == abci.CheckTxType_Recheck: + case abci.CheckTxType_Recheck: mode = execModeReCheck default: diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index e18172d60b..ce82c3d4c1 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -937,12 +937,13 @@ func (app *BaseApp) runTx(mode execMode, txBytes []byte) (gInfo sdk.GasInfo, res anteEvents = events.ToABCIEvents() } - if mode == execModeCheck { + switch mode { + case execModeCheck: err = app.mempool.Insert(ctx, tx) if err != nil { return gInfo, nil, anteEvents, err } - } else if mode == execModeFinalize { + case execModeFinalize: err = app.mempool.Remove(tx) if err != nil && !errors.Is(err, mempool.ErrTxNotFound) { return gInfo, nil, anteEvents, diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go index f63ca762bf..ac91491966 100644 --- a/baseapp/baseapp_test.go +++ b/baseapp/baseapp_test.go @@ -829,11 +829,12 @@ var ctxTypes = []ctxType{QueryCtx, CheckTxCtx} func (c ctxType) GetCtx(t *testing.T, bapp *baseapp.BaseApp) sdk.Context { t.Helper() - if c == QueryCtx { + switch c { + case QueryCtx: ctx, err := bapp.CreateQueryContext(1, false) require.NoError(t, err) return ctx - } else if c == CheckTxCtx { + case CheckTxCtx: return getCheckStateCtx(bapp) } // TODO: Not supported yet diff --git a/baseapp/grpcrouter_test.go b/baseapp/grpcrouter_test.go index af5c24c4cc..a8ba3892b2 100644 --- a/baseapp/grpcrouter_test.go +++ b/baseapp/grpcrouter_test.go @@ -56,7 +56,7 @@ func TestGRPCQueryRouter(t *testing.T) { func TestGRPCRouterHybridHandlers(t *testing.T) { assertRouterBehaviour := func(helper *baseapp.QueryServiceTestHelper) { // test getting the handler by name - handlers := helper.GRPCQueryRouter.HybridHandlerByRequestName("testpb.EchoRequest") + handlers := helper.HybridHandlerByRequestName("testpb.EchoRequest") require.NotNil(t, handlers) require.Len(t, handlers, 1) handler := handlers[0] diff --git a/baseapp/info.go b/baseapp/info.go index 1efb017b05..47f96c3435 100644 --- a/baseapp/info.go +++ b/baseapp/info.go @@ -98,7 +98,7 @@ type voteInfoWrapper struct { var _ comet.VoteInfo = (*voteInfoWrapper)(nil) func (v voteInfoWrapper) GetBlockIDFlag() comet.BlockIDFlag { - return comet.BlockIDFlag(v.VoteInfo.BlockIdFlag) + return comet.BlockIDFlag(v.BlockIdFlag) } func (v voteInfoWrapper) Validator() comet.Validator { @@ -159,11 +159,11 @@ func (r prepareProposalInfo) GetValidatorsHash() []byte { } func (r prepareProposalInfo) GetProposerAddress() []byte { - return r.RequestPrepareProposal.ProposerAddress + return r.ProposerAddress } func (r prepareProposalInfo) GetLastCommit() comet.CommitInfo { - return extendedCommitInfoWrapper{r.RequestPrepareProposal.LocalLastCommit} + return extendedCommitInfoWrapper{r.LocalLastCommit} } var _ comet.BlockInfo = (*prepareProposalInfo)(nil) @@ -203,7 +203,7 @@ type extendedVoteInfoWrapper struct { var _ comet.VoteInfo = (*extendedVoteInfoWrapper)(nil) func (e extendedVoteInfoWrapper) GetBlockIDFlag() comet.BlockIDFlag { - return comet.BlockIDFlag(e.ExtendedVoteInfo.BlockIdFlag) + return comet.BlockIDFlag(e.BlockIdFlag) } func (e extendedVoteInfoWrapper) Validator() comet.Validator { diff --git a/client/grpc_query_test.go b/client/grpc_query_test.go index e1fcd651e6..f409103c73 100644 --- a/client/grpc_query_test.go +++ b/client/grpc_query_test.go @@ -99,7 +99,7 @@ func (s *IntegrationTestSuite) SetupSuite() { // end of app init - s.ctx = app.BaseApp.NewContext(false) + s.ctx = app.NewContext(false) s.cdc = cdc queryHelper := baseapp.NewQueryServerTestHelper(s.ctx, interfaceRegistry) types.RegisterQueryServer(queryHelper, bankKeeper) diff --git a/client/keys/parse.go b/client/keys/parse.go index dc009f56d4..513e976853 100644 --- a/client/keys/parse.go +++ b/client/keys/parse.go @@ -99,7 +99,7 @@ func doParseKey(cmd *cobra.Command, config *sdk.Config, args []string) error { } output, _ := cmd.Flags().GetString(flags.FlagOutput) - if !(runFromBech32(outstream, addr, output) || runFromHex(config, outstream, addr, output)) { + if !runFromBech32(outstream, addr, output) && !runFromHex(config, outstream, addr, output) { return errors.New("couldn't find valid bech32 nor hex data") } diff --git a/client/v2/autocli/msg.go b/client/v2/autocli/msg.go index 322fa6b262..02f214a90e 100644 --- a/client/v2/autocli/msg.go +++ b/client/v2/autocli/msg.go @@ -121,7 +121,7 @@ func (b *Builder) BuildMsgMethodCommand(descriptor protoreflect.MethodDescriptor clientCtx = clientCtx.WithOutput(cmd.OutOrStdout()) fd := input.Descriptor().Fields().ByName(protoreflect.Name(flag.GetSignerFieldName(input.Descriptor()))) - addressCodec := b.Builder.AddressCodec + addressCodec := b.AddressCodec // set signer to signer field if empty if addr := input.Get(fd).String(); addr == "" { @@ -130,9 +130,9 @@ func (b *Builder) BuildMsgMethodCommand(descriptor protoreflect.MethodDescriptor // override address codec if validator or consensus address switch scalarType { case flag.ValidatorAddressStringScalarType: - addressCodec = b.Builder.ValidatorAddressCodec + addressCodec = b.ValidatorAddressCodec case flag.ConsensusAddressStringScalarType: - addressCodec = b.Builder.ConsensusAddressCodec + addressCodec = b.ConsensusAddressCodec } } diff --git a/client/v2/autocli/query.go b/client/v2/autocli/query.go index 56bad2e3ee..92ddb4df11 100644 --- a/client/v2/autocli/query.go +++ b/client/v2/autocli/query.go @@ -7,15 +7,15 @@ import ( "strings" "time" - autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" - "cosmossdk.io/math" - "cosmossdk.io/x/tx/signing/aminojson" "github.com/cockroachdb/errors" "github.com/spf13/cobra" "google.golang.org/protobuf/reflect/protoreflect" + autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" "cosmossdk.io/client/v2/internal/flags" "cosmossdk.io/client/v2/internal/util" + "cosmossdk.io/math" + "cosmossdk.io/x/tx/signing/aminojson" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/collections/colltest/codec.go b/collections/colltest/codec.go index 54249ebf11..daef69c594 100644 --- a/collections/colltest/codec.go +++ b/collections/colltest/codec.go @@ -76,10 +76,8 @@ func TestValueCodec[T any](t *testing.T, encoder codec.ValueCodec[T], value T) { // it in order to make the type known by the MockValueCodec. func MockValueCodec[T any]() codec.ValueCodec[T] { typ := reflect.ValueOf(new(T)).Elem().Type() - isInterface := false - if typ.Kind() == reflect.Interface { - isInterface = true - } + isInterface := typ.Kind() == reflect.Interface + return &mockValueCodec[T]{ isInterface: isInterface, seenTypes: map[string]reflect.Type{}, diff --git a/collections/genesis_test.go b/collections/genesis_test.go index 34fb60e141..a22766ffa2 100644 --- a/collections/genesis_test.go +++ b/collections/genesis_test.go @@ -20,10 +20,10 @@ func TestDefaultGenesis(t *testing.T) { return w, nil })) require.Len(t, writers, 4) - require.Equal(t, `[]`, writers[0].Buffer.String()) - require.Equal(t, `[]`, writers[1].Buffer.String()) - require.Equal(t, `[]`, writers[2].Buffer.String()) - require.Equal(t, `[]`, writers[3].Buffer.String()) + require.Equal(t, `[]`, writers[0].String()) + require.Equal(t, `[]`, writers[1].String()) + require.Equal(t, `[]`, writers[2].String()) + require.Equal(t, `[]`, writers[3].String()) } func TestValidateGenesis(t *testing.T) { @@ -75,10 +75,10 @@ func TestExportGenesis(t *testing.T) { return w, nil })) require.Len(t, writers, 4) - require.Equal(t, expectedItemGenesis, writers[0].Buffer.String()) - require.Equal(t, expectedKeySetGenesis, writers[1].Buffer.String()) - require.Equal(t, expectedMapGenesis, writers[2].Buffer.String()) - require.Equal(t, expectedSequenceGenesis, writers[3].Buffer.String()) + require.Equal(t, expectedItemGenesis, writers[0].String()) + require.Equal(t, expectedKeySetGenesis, writers[1].String()) + require.Equal(t, expectedMapGenesis, writers[2].String()) + require.Equal(t, expectedSequenceGenesis, writers[3].String()) } type testFixture struct { diff --git a/core/genesis/target.go b/core/genesis/target.go index fb2805f342..86ffe12ae4 100644 --- a/core/genesis/target.go +++ b/core/genesis/target.go @@ -39,6 +39,6 @@ type genesisWriter struct { } func (r genesisWriter) Close() error { - r.sink.m[r.field] = r.Buffer.Bytes() + r.sink.m[r.field] = r.Bytes() return nil } diff --git a/crypto/hd/hdpath.go b/crypto/hd/hdpath.go index 7873ea0a2c..c066de40f9 100644 --- a/crypto/hd/hdpath.go +++ b/crypto/hd/hdpath.go @@ -87,7 +87,7 @@ func NewParamsFromPath(path string) (*BIP44Params, error) { fmt.Errorf("fourth and fifth field in path must not be hardened (ie. not contain the suffix ', got %s and %s", spl[3], spl[4]) } - if !(change == 0 || change == 1) { + if change != 0 && change != 1 { return nil, fmt.Errorf("change field can only be 0 or 1") } diff --git a/crypto/keyring/autocli.go b/crypto/keyring/autocli.go index 0dd91ff60a..37d8ecbaef 100644 --- a/crypto/keyring/autocli.go +++ b/crypto/keyring/autocli.go @@ -48,7 +48,7 @@ func (a *autoCLIKeyringAdapter) List() ([]string, error) { // LookupAddressByKeyName returns the address of a key stored in the keyring func (a *autoCLIKeyringAdapter) LookupAddressByKeyName(name string) ([]byte, error) { - record, err := a.Keyring.Key(name) + record, err := a.Key(name) if err != nil { return nil, err } @@ -62,7 +62,7 @@ func (a *autoCLIKeyringAdapter) LookupAddressByKeyName(name string) ([]byte, err } func (a *autoCLIKeyringAdapter) GetPubKey(name string) (cryptotypes.PubKey, error) { - record, err := a.Keyring.Key(name) + record, err := a.Key(name) if err != nil { return nil, err } @@ -71,7 +71,7 @@ func (a *autoCLIKeyringAdapter) GetPubKey(name string) (cryptotypes.PubKey, erro } func (a *autoCLIKeyringAdapter) Sign(name string, msg []byte, signMode signingv1beta1.SignMode) ([]byte, error) { - record, err := a.Keyring.Key(name) + record, err := a.Key(name) if err != nil { return nil, err } diff --git a/crypto/keys/internal/ecdsa/pubkey_internal_test.go b/crypto/keys/internal/ecdsa/pubkey_internal_test.go index 5434c8504c..5fc1c778f0 100644 --- a/crypto/keys/internal/ecdsa/pubkey_internal_test.go +++ b/crypto/keys/internal/ecdsa/pubkey_internal_test.go @@ -67,5 +67,5 @@ func (suite *PKSuite) TestMarshal() { pk := new(PubKey) err = pk.Unmarshal(buffer, secp256r1, size) require.NoError(err) - require.True(pk.PublicKey.Equal(&suite.pk.PublicKey)) + require.True(pk.Equal(&suite.pk.PublicKey)) } diff --git a/crypto/keys/secp256r1/privkey.go b/crypto/keys/secp256r1/privkey.go index 3080dec217..09939cc65e 100644 --- a/crypto/keys/secp256r1/privkey.go +++ b/crypto/keys/secp256r1/privkey.go @@ -58,12 +58,12 @@ type ecdsaSK struct { // Marshal implements customProtobufType. func (sk ecdsaSK) Marshal() ([]byte, error) { - return sk.PrivKey.Bytes(), nil + return sk.Bytes(), nil } // MarshalJSON implements customProtobufType. func (sk ecdsaSK) MarshalJSON() ([]byte, error) { - b64 := base64.StdEncoding.EncodeToString(sk.PrivKey.Bytes()) + b64 := base64.StdEncoding.EncodeToString(sk.Bytes()) return []byte("\"" + b64 + "\""), nil } diff --git a/crypto/keys/secp256r1/pubkey.go b/crypto/keys/secp256r1/pubkey.go index fea06f73f2..50dc2278ef 100644 --- a/crypto/keys/secp256r1/pubkey.go +++ b/crypto/keys/secp256r1/pubkey.go @@ -67,12 +67,12 @@ type ecdsaPK struct { // Marshal implements customProtobufType. func (pk ecdsaPK) Marshal() ([]byte, error) { - return pk.PubKey.Bytes(), nil + return pk.Bytes(), nil } // MarshalJSON implements customProtobufType. func (pk ecdsaPK) MarshalJSON() ([]byte, error) { - b64 := base64.StdEncoding.EncodeToString(pk.PubKey.Bytes()) + b64 := base64.StdEncoding.EncodeToString(pk.Bytes()) return []byte("\"" + b64 + "\""), nil } diff --git a/depinject/internal/graphviz/edge.go b/depinject/internal/graphviz/edge.go index 368e5a0d30..33caa75db9 100644 --- a/depinject/internal/graphviz/edge.go +++ b/depinject/internal/graphviz/edge.go @@ -12,6 +12,6 @@ type Edge struct { } func (e Edge) render(w io.Writer, indent string) error { - _, err := fmt.Fprintf(w, "%s%q -> %q%s;\n", indent, e.from.name, e.to.name, e.Attributes.String()) + _, err := fmt.Fprintf(w, "%s%q -> %q%s;\n", indent, e.from.name, e.to.name, e.String()) return err } diff --git a/depinject/internal/graphviz/node.go b/depinject/internal/graphviz/node.go index d464aad869..d7de15f941 100644 --- a/depinject/internal/graphviz/node.go +++ b/depinject/internal/graphviz/node.go @@ -12,6 +12,6 @@ type Node struct { } func (n Node) render(w io.Writer, indent string) error { - _, err := fmt.Fprintf(w, "%s%q%s;\n", indent, n.name, n.Attributes.String()) + _, err := fmt.Fprintf(w, "%s%q%s;\n", indent, n.name, n.String()) return err } diff --git a/depinject/provider_desc_test.go b/depinject/provider_desc_test.go index cbaca1d197..4f16849149 100644 --- a/depinject/provider_desc_test.go +++ b/depinject/provider_desc_test.go @@ -45,7 +45,7 @@ func StructInAndOut(_ float32, _ StructIn, _ byte) (int16, StructOut, int32, err return int16(0), StructOut{}, int32(0), nil } -func BadErrorPosition() (error, int) { return nil, 0 } //nolint:stylecheck // Deliberately has error as first of multiple arguments. +func BadErrorPosition() (error, int) { return nil, 0 } //nolint:stylecheck,staticcheck // Deliberately has error as first of multiple arguments. func BadOptionalFn(_ BadOptional) int { return 0 } diff --git a/math/legacy_dec.go b/math/legacy_dec.go index 16bb080686..27f7c38e3b 100644 --- a/math/legacy_dec.go +++ b/math/legacy_dec.go @@ -305,7 +305,7 @@ func (d LegacyDec) assertInValidRange() { // IsInValidRange returns true when the value is between the upper limit of (2^256 * 10^18) // and the lower limit of -1*(2^256 * 10^18). func (d LegacyDec) IsInValidRange() bool { - return !(d.GT(upperLimit) || d.LT(lowerLimit)) + return !d.GT(upperLimit) && !d.LT(lowerLimit) } // Mul multiplication diff --git a/runtime/events.go b/runtime/events.go index 752dcae2bb..56a69abe8b 100644 --- a/runtime/events.go +++ b/runtime/events.go @@ -35,7 +35,7 @@ func NewEventManager(ctx context.Context) event.Manager { // Emit emits an typed event that is defined in the protobuf file. // In the future these events will be added to consensus. func (e Events) Emit(ctx context.Context, event protoiface.MessageV1) error { - return e.EventManagerI.EmitTypedEvent(event) + return e.EmitTypedEvent(event) } // EmitKV emits a key value pair event. @@ -46,12 +46,12 @@ func (e Events) EmitKV(ctx context.Context, eventType string, attrs ...event.Att attributes = append(attributes, sdk.NewAttribute(attr.Key, attr.Value)) } - e.EventManagerI.EmitEvents(sdk.Events{sdk.NewEvent(eventType, attributes...)}) + e.EmitEvents(sdk.Events{sdk.NewEvent(eventType, attributes...)}) return nil } // Emit emits an typed event that is defined in the protobuf file. // In the future these events will be added to consensus. func (e Events) EmitNonConsensus(ctx context.Context, event protoiface.MessageV1) error { - return e.EventManagerI.EmitTypedEvent(event) + return e.EmitTypedEvent(event) } diff --git a/server/config/config.go b/server/config/config.go index d97dedc5f5..e70615b853 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -279,7 +279,7 @@ func GetConfig(v *viper.Viper) (Config, error) { // ValidateBasic returns an error if min-gas-prices field is empty in BaseConfig. Otherwise, it returns nil. func (c Config) ValidateBasic() error { - if c.BaseConfig.MinGasPrices == "" { + if c.MinGasPrices == "" { return sdkerrors.ErrAppConfig.Wrap("set min gas price in app.toml or flag or env variable") } if c.Pruning == pruningtypes.PruningOptionEverything && c.StateSync.SnapshotInterval > 0 { diff --git a/server/util_test.go b/server/util_test.go index 50f3e9a67a..9c55cb6560 100644 --- a/server/util_test.go +++ b/server/util_test.go @@ -443,7 +443,7 @@ func TestEmptyMinGasPrices(t *testing.T) { // Modify app.toml. appCfgTempFilePath := filepath.Join(tempDir, "config", "app.toml") appConf := config.DefaultConfig() - appConf.BaseConfig.MinGasPrices = "" + appConf.MinGasPrices = "" config.WriteConfigFile(appCfgTempFilePath, appConf) // Run StartCmd. diff --git a/simapp/export.go b/simapp/export.go index b398d68d5b..8baf066772 100644 --- a/simapp/export.go +++ b/simapp/export.go @@ -45,7 +45,7 @@ func (app *SimApp) ExportAppStateAndValidators(forZeroHeight bool, jailAllowedAd AppState: appState, Validators: validators, Height: height, - ConsensusParams: app.BaseApp.GetConsensusParams(ctx), + ConsensusParams: app.GetConsensusParams(ctx), }, err } @@ -54,12 +54,9 @@ func (app *SimApp) ExportAppStateAndValidators(forZeroHeight bool, jailAllowedAd // // in favor of export at a block height func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []string) { - applyAllowedAddrs := false + applyAllowedAddrs := len(jailAllowedAddrs) > 0 // check if there is a allowed address list - if len(jailAllowedAddrs) > 0 { - applyAllowedAddrs = true - } allowedAddrsMap := make(map[string]bool) diff --git a/store/snapshots/manager.go b/store/snapshots/manager.go index 3bedcd3ae0..663b534e57 100644 --- a/store/snapshots/manager.go +++ b/store/snapshots/manager.go @@ -368,11 +368,8 @@ func (m *Manager) doRestoreSnapshot(snapshot types.Snapshot, chChunks <-chan io. return errorsmod.Wrap(err, "multistore restore") } - for { - if nextItem.Item == nil { - // end of stream - break - } + for nextItem.Item != nil { + metadata := nextItem.GetExtension() if metadata == nil { return errorsmod.Wrapf(storetypes.ErrLogic, "unknown snapshot item %T", nextItem.Item) diff --git a/systemtests/system.go b/systemtests/system.go index 599e58b5eb..f44aca8b01 100644 --- a/systemtests/system.go +++ b/systemtests/system.go @@ -846,11 +846,11 @@ type ( func (l *EventListener) Subscribe(query string, cb EventConsumer) func() { ctx, done := context.WithCancel(context.Background()) l.t.Cleanup(done) - eventsChan, err := l.client.WSEvents.Subscribe(ctx, "testing", query) + eventsChan, err := l.client.Subscribe(ctx, "testing", query) require.NoError(l.t, err) cleanup := func() { - ctx, _ := context.WithTimeout(ctx, DefaultWaitTime) //nolint:govet // used in cleanup only - go l.client.WSEvents.Unsubscribe(ctx, "testing", query) //nolint:errcheck // used by tests only + ctx, _ := context.WithTimeout(ctx, DefaultWaitTime) //nolint:govet // used in cleanup only + go l.client.Unsubscribe(ctx, "testing", query) //nolint:errcheck // used by tests only done() } go func() { diff --git a/tests/integration/distribution/module_test.go b/tests/integration/distribution/module_test.go index 8da05004b1..76912ac2ae 100644 --- a/tests/integration/distribution/module_test.go +++ b/tests/integration/distribution/module_test.go @@ -26,7 +26,7 @@ func TestItCreatesModuleAccountOnInitBlock(t *testing.T) { &accountKeeper) assert.NilError(t, err) - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) acc := accountKeeper.GetAccount(ctx, authtypes.NewModuleAddress(types.ModuleName)) assert.Assert(t, acc != nil) } diff --git a/tests/integration/evidence/keeper/infraction_test.go b/tests/integration/evidence/keeper/infraction_test.go index ec6e70765f..18a507f96d 100644 --- a/tests/integration/evidence/keeper/infraction_test.go +++ b/tests/integration/evidence/keeper/infraction_test.go @@ -293,8 +293,8 @@ func TestHandleDoubleSign_TooOld(t *testing.T) { }}, }) - assert.NilError(t, f.app.BaseApp.StoreConsensusParams(ctx, *simtestutil.DefaultConsensusParams)) - cp := f.app.BaseApp.GetConsensusParams(ctx) + assert.NilError(t, f.app.StoreConsensusParams(ctx, *simtestutil.DefaultConsensusParams)) + cp := f.app.GetConsensusParams(ctx) ctx = ctx.WithCometInfo(nci) ctx = ctx.WithConsensusParams(cp) diff --git a/tests/integration/gov/genesis_test.go b/tests/integration/gov/genesis_test.go index 6e7bbae25f..f3d1784e53 100644 --- a/tests/integration/gov/genesis_test.go +++ b/tests/integration/gov/genesis_test.go @@ -72,7 +72,7 @@ func TestImportExportQueues(t *testing.T) { ) assert.NilError(t, err) - ctx := s1.app.BaseApp.NewContext(false) + ctx := s1.app.NewContext(false) addrs := simtestutil.AddTestAddrs(s1.BankKeeper, s1.StakingKeeper, ctx, 1, valTokens) _, err = s1.app.FinalizeBlock(&abci.RequestFinalizeBlock{ @@ -80,7 +80,7 @@ func TestImportExportQueues(t *testing.T) { }) assert.NilError(t, err) - ctx = s1.app.BaseApp.NewContext(false) + ctx = s1.app.NewContext(false) // Create two proposals, put the second into the voting period proposal1, err := s1.GovKeeper.SubmitProposal(ctx, []sdk.Msg{mkTestLegacyContent(t)}, "", "test", "description", addrs[0], false) assert.NilError(t, err) @@ -158,7 +158,7 @@ func TestImportExportQueues(t *testing.T) { }) assert.NilError(t, err) - ctx2 := s2.app.BaseApp.NewContext(false) + ctx2 := s2.app.NewContext(false) params, err = s2.GovKeeper.Params.Get(ctx2) assert.NilError(t, err) diff --git a/tests/integration/gov/module_test.go b/tests/integration/gov/module_test.go index 7853a51da6..9596240afc 100644 --- a/tests/integration/gov/module_test.go +++ b/tests/integration/gov/module_test.go @@ -36,7 +36,7 @@ func TestItCreatesModuleAccountOnInitBlock(t *testing.T) { ) assert.NilError(t, err) - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) acc := accountKeeper.GetAccount(ctx, authtypes.NewModuleAddress(types.ModuleName)) assert.Assert(t, acc != nil) } diff --git a/tests/integration/runtime/query_test.go b/tests/integration/runtime/query_test.go index 00dbe8dd76..1642d4dfef 100644 --- a/tests/integration/runtime/query_test.go +++ b/tests/integration/runtime/query_test.go @@ -56,9 +56,9 @@ func initFixture(t assert.TestingT) *fixture { ) assert.NilError(t, err) - f.ctx = app.BaseApp.NewContext(false) + f.ctx = app.NewContext(false) queryHelper := &baseapp.QueryServiceTestHelper{ - GRPCQueryRouter: app.BaseApp.GRPCQueryRouter(), + GRPCQueryRouter: app.GRPCQueryRouter(), Ctx: f.ctx, } f.appQueryClient = appv1alpha1.NewQueryClient(queryHelper) diff --git a/tools/confix/migrations.go b/tools/confix/migrations.go index cc34ffadf3..97b0859aa9 100644 --- a/tools/confix/migrations.go +++ b/tools/confix/migrations.go @@ -242,7 +242,7 @@ func createUpdateStep(oldKey, newKey string, oldEntry *parser.KeyValue) transfor return nil } - newEntry.KeyValue.Value = oldEntry.Value + newEntry.Value = oldEntry.Value return nil }), } diff --git a/tools/cosmovisor/process.go b/tools/cosmovisor/process.go index 8658c40116..4047193693 100644 --- a/tools/cosmovisor/process.go +++ b/tools/cosmovisor/process.go @@ -433,7 +433,7 @@ func (l *Launcher) doPreUpgrade() error { var exitErr *exec.ExitError if errors.As(err, &exitErr) { - switch exitErr.ProcessState.ExitCode() { + switch exitErr.ExitCode() { case 1: l.logger.Info("pre-upgrade command does not exist. continuing the upgrade.") return nil diff --git a/types/address.go b/types/address.go index 49e5980bd2..64bafffe79 100644 --- a/types/address.go +++ b/types/address.go @@ -322,9 +322,9 @@ func (aa AccAddress) Format(s fmt.State, verb rune) { case 's': _, _ = s.Write([]byte(aa.String())) case 'p': - _, _ = s.Write([]byte(fmt.Sprintf("%p", aa))) + _, _ = fmt.Fprintf(s, "%p", aa) default: - _, _ = s.Write([]byte(fmt.Sprintf("%X", []byte(aa)))) + _, _ = fmt.Fprintf(s, "%X", []byte(aa)) } } @@ -486,9 +486,9 @@ func (va ValAddress) Format(s fmt.State, verb rune) { case 's': _, _ = s.Write([]byte(va.String())) case 'p': - _, _ = s.Write([]byte(fmt.Sprintf("%p", va))) + _, _ = fmt.Fprintf(s, "%p", va) default: - _, _ = s.Write([]byte(fmt.Sprintf("%X", []byte(va)))) + _, _ = fmt.Fprintf(s, "%X", []byte(va)) } } @@ -670,9 +670,9 @@ func (ca ConsAddress) Format(s fmt.State, verb rune) { case 's': _, _ = s.Write([]byte(ca.String())) case 'p': - _, _ = s.Write([]byte(fmt.Sprintf("%p", ca))) + _, _ = fmt.Fprintf(s, "%p", ca) default: - _, _ = s.Write([]byte(fmt.Sprintf("%X", []byte(ca)))) + _, _ = fmt.Fprintf(s, "%X", []byte(ca)) } } diff --git a/types/query/pagination_test.go b/types/query/pagination_test.go index 13fbe98efa..068ddce1cd 100644 --- a/types/query/pagination_test.go +++ b/types/query/pagination_test.go @@ -81,7 +81,7 @@ func (s *paginationTestSuite) SetupTest() { s.NoError(err) - ctx := app.BaseApp.NewContextLegacy(false, cmtproto.Header{Height: 1}) + ctx := app.NewContextLegacy(false, cmtproto.Header{Height: 1}) s.ctx, s.bankKeeper, s.accountKeeper, s.cdc, s.app, s.interfaceReg = ctx, bankKeeper, accountKeeper, cdc, app, reg } diff --git a/x/auth/client/tx_test.go b/x/auth/client/tx_test.go index 99d12d5ab8..9f66399e76 100644 --- a/x/auth/client/tx_test.go +++ b/x/auth/client/tx_test.go @@ -27,7 +27,7 @@ func TestParseQueryResponse(t *testing.T) { res, err := authclient.ParseQueryResponse(bz) require.NoError(t, err) - require.Equal(t, 10, int(res.GasInfo.GasUsed)) + require.Equal(t, 10, int(res.GasUsed)) require.NotNil(t, res.Result) res, err = authclient.ParseQueryResponse([]byte("fuzzy")) diff --git a/x/auth/keeper/keeper_bench_test.go b/x/auth/keeper/keeper_bench_test.go index 55203dc99b..4033569d5b 100644 --- a/x/auth/keeper/keeper_bench_test.go +++ b/x/auth/keeper/keeper_bench_test.go @@ -26,7 +26,7 @@ func BenchmarkAccountMapperGetAccountFound(b *testing.B) { ) require.NoError(b, err) - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) // assumes b.N < 2**24 for i := 0; i < b.N; i++ { @@ -53,7 +53,7 @@ func BenchmarkAccountMapperSetAccount(b *testing.B) { ), &accountKeeper) require.NoError(b, err) - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) b.ResetTimer() diff --git a/x/auth/migrations/legacytx/stdsign.go b/x/auth/migrations/legacytx/stdsign.go index 8a224ca6d7..dfd83a4f11 100644 --- a/x/auth/migrations/legacytx/stdsign.go +++ b/x/auth/migrations/legacytx/stdsign.go @@ -112,7 +112,7 @@ func (ss StdSignature) GetPubKey() cryptotypes.PubKey { func (ss StdSignature) MarshalYAML() (interface{}, error) { pk := "" if ss.PubKey != nil { - pk = ss.PubKey.String() + pk = ss.String() } bz, err := yaml.Marshal(struct { diff --git a/x/auth/migrations/legacytx/stdtx_builder.go b/x/auth/migrations/legacytx/stdtx_builder.go index 3965c79cc7..88bfe11575 100644 --- a/x/auth/migrations/legacytx/stdtx_builder.go +++ b/x/auth/migrations/legacytx/stdtx_builder.go @@ -38,11 +38,11 @@ func (s *StdTxBuilder) SetSignatures(signatures ...signing.SignatureV2) error { } func (s *StdTxBuilder) SetFeeAmount(amount sdk.Coins) { - s.StdTx.Fee.Amount = amount + s.Fee.Amount = amount } func (s *StdTxBuilder) SetGasLimit(limit uint64) { - s.StdTx.Fee.Gas = limit + s.Fee.Gas = limit } // SetMemo implements TxBuilder.SetMemo diff --git a/x/auth/migrations/v2/store_test.go b/x/auth/migrations/v2/store_test.go index 78a5be9ed7..bcae13c7b3 100644 --- a/x/auth/migrations/v2/store_test.go +++ b/x/auth/migrations/v2/store_test.go @@ -73,7 +73,7 @@ func TestMigrateVestingAccounts(t *testing.T) { legacySubspace := newMockSubspace(authtypes.DefaultParams()) require.NoError(t, v4.Migrate(ctx, storeService, legacySubspace, cdc)) - ctx = app.BaseApp.NewContextLegacy(false, cmtproto.Header{Time: time.Now()}) + ctx = app.NewContextLegacy(false, cmtproto.Header{Time: time.Now()}) require.NoError(t, stakingKeeper.SetParams(ctx, stakingtypes.DefaultParams())) lastAccNum := uint64(1000) createBaseAccount := func(addr sdk.AccAddress) *authtypes.BaseAccount { diff --git a/x/auth/migrations/v3/store_test.go b/x/auth/migrations/v3/store_test.go index 5ff190ca23..32bfb82f18 100644 --- a/x/auth/migrations/v3/store_test.go +++ b/x/auth/migrations/v3/store_test.go @@ -69,7 +69,7 @@ func TestMigrateMapAccAddressToAccNumberKey(t *testing.T) { randAccNumber := uint64(rand.Intn(100000-10000) + 10000) acc := authtypes.NewBaseAccount(senderPrivKey.PubKey().Address().Bytes(), senderPrivKey.PubKey(), randAccNumber, 0) - ctx = app.BaseApp.NewContextLegacy(false, cmtproto.Header{Time: time.Now()}) + ctx = app.NewContextLegacy(false, cmtproto.Header{Time: time.Now()}) // migrator m := keeper.NewMigrator(accountKeeper, app.GRPCQueryRouter(), legacySubspace) diff --git a/x/auth/module_test.go b/x/auth/module_test.go index 742658e5ca..df5e92770b 100644 --- a/x/auth/module_test.go +++ b/x/auth/module_test.go @@ -24,7 +24,7 @@ func TestItCreatesModuleAccountOnInitBlock(t *testing.T) { &accountKeeper) require.NoError(t, err) - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) acc := accountKeeper.GetAccount(ctx, types.NewModuleAddress(types.FeeCollectorName)) require.NotNil(t, acc) } diff --git a/x/auth/simulation/genesis.go b/x/auth/simulation/genesis.go index c6984cc355..c4586ee966 100644 --- a/x/auth/simulation/genesis.go +++ b/x/auth/simulation/genesis.go @@ -30,7 +30,7 @@ func RandomGenesisAccounts(simState *module.SimulationState) types.GenesisAccoun // Only consider making a vesting account once the initial bonded validator // set is exhausted due to needing to track DelegatedVesting. - if !(int64(i) > simState.NumBonded && simState.Rand.Intn(100) < 50) { + if int64(i) <= simState.NumBonded || simState.Rand.Intn(100) >= 50 { genesisAccs[i] = bacc continue } diff --git a/x/auth/vesting/msg_server.go b/x/auth/vesting/msg_server.go index 222fc262a2..c7e903e63e 100644 --- a/x/auth/vesting/msg_server.go +++ b/x/auth/vesting/msg_server.go @@ -48,20 +48,20 @@ func (s msgServer) CreateVestingAccount(goCtx context.Context, msg *types.MsgCre } ctx := sdk.UnwrapSDKContext(goCtx) - if err := s.BankKeeper.IsSendEnabledCoins(ctx, msg.Amount...); err != nil { + if err := s.IsSendEnabledCoins(ctx, msg.Amount...); err != nil { return nil, err } - if s.BankKeeper.BlockedAddr(to) { + if s.BlockedAddr(to) { return nil, errorsmod.Wrapf(sdkerrors.ErrUnauthorized, "%s is not allowed to receive funds", msg.ToAddress) } - if acc := s.AccountKeeper.GetAccount(ctx, to); acc != nil { + if acc := s.GetAccount(ctx, to); acc != nil { return nil, errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "account %s already exists", msg.ToAddress) } baseAccount := authtypes.NewBaseAccountWithAddress(to) - baseAccount = s.AccountKeeper.NewAccount(ctx, baseAccount).(*authtypes.BaseAccount) + baseAccount = s.NewAccount(ctx, baseAccount).(*authtypes.BaseAccount) baseVestingAccount, err := types.NewBaseVestingAccount(baseAccount, msg.Amount.Sort(), msg.EndTime) if err != nil { return nil, errorsmod.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) @@ -74,7 +74,7 @@ func (s msgServer) CreateVestingAccount(goCtx context.Context, msg *types.MsgCre vestingAccount = types.NewContinuousVestingAccountRaw(baseVestingAccount, ctx.BlockTime().Unix()) } - s.AccountKeeper.SetAccount(ctx, vestingAccount) + s.SetAccount(ctx, vestingAccount) defer func() { telemetry.IncrCounter(1, "new", "account") @@ -90,7 +90,7 @@ func (s msgServer) CreateVestingAccount(goCtx context.Context, msg *types.MsgCre } }() - if err = s.BankKeeper.SendCoins(ctx, from, to, msg.Amount); err != nil { + if err = s.SendCoins(ctx, from, to, msg.Amount); err != nil { return nil, err } @@ -113,26 +113,26 @@ func (s msgServer) CreatePermanentLockedAccount(goCtx context.Context, msg *type } ctx := sdk.UnwrapSDKContext(goCtx) - if err := s.BankKeeper.IsSendEnabledCoins(ctx, msg.Amount...); err != nil { + if err := s.IsSendEnabledCoins(ctx, msg.Amount...); err != nil { return nil, err } - if s.BankKeeper.BlockedAddr(to) { + if s.BlockedAddr(to) { return nil, errorsmod.Wrapf(sdkerrors.ErrUnauthorized, "%s is not allowed to receive funds", msg.ToAddress) } - if acc := s.AccountKeeper.GetAccount(ctx, to); acc != nil { + if acc := s.GetAccount(ctx, to); acc != nil { return nil, errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "account %s already exists", msg.ToAddress) } baseAccount := authtypes.NewBaseAccountWithAddress(to) - baseAccount = s.AccountKeeper.NewAccount(ctx, baseAccount).(*authtypes.BaseAccount) + baseAccount = s.NewAccount(ctx, baseAccount).(*authtypes.BaseAccount) vestingAccount, err := types.NewPermanentLockedAccount(baseAccount, msg.Amount) if err != nil { return nil, errorsmod.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } - s.AccountKeeper.SetAccount(ctx, vestingAccount) + s.SetAccount(ctx, vestingAccount) defer func() { telemetry.IncrCounter(1, "new", "account") @@ -148,7 +148,7 @@ func (s msgServer) CreatePermanentLockedAccount(goCtx context.Context, msg *type } }() - if err = s.BankKeeper.SendCoins(ctx, from, to, msg.Amount); err != nil { + if err = s.SendCoins(ctx, from, to, msg.Amount); err != nil { return nil, err } @@ -183,27 +183,27 @@ func (s msgServer) CreatePeriodicVestingAccount(goCtx context.Context, msg *type totalCoins = totalCoins.Add(period.Amount...) } - if s.BankKeeper.BlockedAddr(to) { + if s.BlockedAddr(to) { return nil, errorsmod.Wrapf(sdkerrors.ErrUnauthorized, "%s is not allowed to receive funds", msg.ToAddress) } ctx := sdk.UnwrapSDKContext(goCtx) - if acc := s.AccountKeeper.GetAccount(ctx, to); acc != nil { + if acc := s.GetAccount(ctx, to); acc != nil { return nil, errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "account %s already exists", msg.ToAddress) } - if err := s.BankKeeper.IsSendEnabledCoins(ctx, totalCoins...); err != nil { + if err := s.IsSendEnabledCoins(ctx, totalCoins...); err != nil { return nil, err } baseAccount := authtypes.NewBaseAccountWithAddress(to) - baseAccount = s.AccountKeeper.NewAccount(ctx, baseAccount).(*authtypes.BaseAccount) + baseAccount = s.NewAccount(ctx, baseAccount).(*authtypes.BaseAccount) vestingAccount, err := types.NewPeriodicVestingAccount(baseAccount, totalCoins.Sort(), msg.StartTime, msg.VestingPeriods) if err != nil { return nil, errorsmod.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } - s.AccountKeeper.SetAccount(ctx, vestingAccount) + s.SetAccount(ctx, vestingAccount) defer func() { telemetry.IncrCounter(1, "new", "account") @@ -219,7 +219,7 @@ func (s msgServer) CreatePeriodicVestingAccount(goCtx context.Context, msg *type } }() - if err = s.BankKeeper.SendCoins(ctx, from, to, totalCoins); err != nil { + if err = s.SendCoins(ctx, from, to, totalCoins); err != nil { return nil, err } diff --git a/x/auth/vesting/types/vesting_account.go b/x/auth/vesting/types/vesting_account.go index 868dc49588..30c012b70d 100644 --- a/x/auth/vesting/types/vesting_account.go +++ b/x/auth/vesting/types/vesting_account.go @@ -229,7 +229,7 @@ func (cva ContinuousVestingAccount) GetVestingCoins(blockTime time.Time) sdk.Coi // LockedCoins returns the set of coins that are not spendable (i.e. locked), // defined as the vesting coins that are not delegated. func (cva ContinuousVestingAccount) LockedCoins(blockTime time.Time) sdk.Coins { - return cva.BaseVestingAccount.LockedCoinsFromVesting(cva.GetVestingCoins(blockTime)) + return cva.LockedCoinsFromVesting(cva.GetVestingCoins(blockTime)) } // TrackDelegation tracks a desired delegation amount by setting the appropriate @@ -334,7 +334,7 @@ func (pva PeriodicVestingAccount) GetVestingCoins(blockTime time.Time) sdk.Coins // LockedCoins returns the set of coins that are not spendable (i.e. locked), // defined as the vesting coins that are not delegated. func (pva PeriodicVestingAccount) LockedCoins(blockTime time.Time) sdk.Coins { - return pva.BaseVestingAccount.LockedCoinsFromVesting(pva.GetVestingCoins(blockTime)) + return pva.LockedCoinsFromVesting(pva.GetVestingCoins(blockTime)) } // TrackDelegation tracks a desired delegation amount by setting the appropriate @@ -433,7 +433,7 @@ func (dva DelayedVestingAccount) GetVestingCoins(blockTime time.Time) sdk.Coins // LockedCoins returns the set of coins that are not spendable (i.e. locked), // defined as the vesting coins that are not delegated. func (dva DelayedVestingAccount) LockedCoins(blockTime time.Time) sdk.Coins { - return dva.BaseVestingAccount.LockedCoinsFromVesting(dva.GetVestingCoins(blockTime)) + return dva.LockedCoinsFromVesting(dva.GetVestingCoins(blockTime)) } // TrackDelegation tracks a desired delegation amount by setting the appropriate @@ -489,7 +489,7 @@ func (plva PermanentLockedAccount) GetVestingCoins(_ time.Time) sdk.Coins { // LockedCoins returns the set of coins that are not spendable (i.e. locked), // defined as the vesting coins that are not delegated. func (plva PermanentLockedAccount) LockedCoins(_ time.Time) sdk.Coins { - return plva.BaseVestingAccount.LockedCoinsFromVesting(plva.OriginalVesting) + return plva.LockedCoinsFromVesting(plva.OriginalVesting) } // TrackDelegation tracks a desired delegation amount by setting the appropriate diff --git a/x/authz/simulation/operations_test.go b/x/authz/simulation/operations_test.go index 68f9fbec26..01364fc8de 100644 --- a/x/authz/simulation/operations_test.go +++ b/x/authz/simulation/operations_test.go @@ -61,7 +61,7 @@ func (suite *SimTestSuite) SetupTest() { ) suite.Require().NoError(err) suite.app = app - suite.ctx = app.BaseApp.NewContext(false) + suite.ctx = app.NewContext(false) } func (suite *SimTestSuite) TestWeightedOperations() { diff --git a/x/bank/app_test.go b/x/bank/app_test.go index 1d7e64373c..8883fde6f0 100644 --- a/x/bank/app_test.go +++ b/x/bank/app_test.go @@ -374,7 +374,7 @@ func TestMsgSetSendEnabled(t *testing.T) { genAccs := []authtypes.GenesisAccount{acc1} s := createTestSuite(t, genAccs) - ctx := s.App.BaseApp.NewContext(false) + ctx := s.App.NewContext(false) require.NoError(t, testutil.FundAccount(ctx, s.BankKeeper, addr1, sdk.NewCoins(sdk.NewInt64Coin("foocoin", 101)))) require.NoError(t, testutil.FundAccount(ctx, s.BankKeeper, addr1, sdk.NewCoins(sdk.NewInt64Coin("stake", 100000)))) addr1Str := addr1.String() diff --git a/x/bank/keeper/keeper_test.go b/x/bank/keeper/keeper_test.go index 53131b00d1..be46327feb 100644 --- a/x/bank/keeper/keeper_test.go +++ b/x/bank/keeper/keeper_test.go @@ -2286,10 +2286,7 @@ func (suite *KeeperTestSuite) TestIterateSendEnabledEntries() { suite.T().Run(fmt.Sprintf("all denoms have expected values default %t", def), func(t *testing.T) { bankKeeper.IterateSendEnabledEntries(ctx, func(denom string, sendEnabled bool) (stop bool) { seen = append(seen, denom) - exp := true - if strings.HasSuffix(denom, "false") { - exp = false - } + exp := !strings.HasSuffix(denom, "false") require.Equal(exp, sendEnabled, denom) return false diff --git a/x/bank/simulation/operations_test.go b/x/bank/simulation/operations_test.go index 3a27f32dae..5b8c23d053 100644 --- a/x/bank/simulation/operations_test.go +++ b/x/bank/simulation/operations_test.go @@ -61,7 +61,7 @@ func (suite *SimTestSuite) SetupTest() { suite.NoError(err) - suite.ctx = suite.app.BaseApp.NewContext(false) + suite.ctx = suite.app.NewContext(false) } // TestWeightedOperations tests the weights of the operations. diff --git a/x/distribution/simulation/operations_test.go b/x/distribution/simulation/operations_test.go index ca74f5eb73..38a3a49f4b 100644 --- a/x/distribution/simulation/operations_test.go +++ b/x/distribution/simulation/operations_test.go @@ -276,7 +276,7 @@ func (suite *SimTestSuite) SetupTest() { suite.NoError(err) - suite.ctx = suite.app.BaseApp.NewContext(false) + suite.ctx = suite.app.NewContext(false) genesisVals, err := suite.stakingKeeper.GetAllValidators(suite.ctx) suite.Require().NoError(err) diff --git a/x/epochs/keeper/grpc_query.go b/x/epochs/keeper/grpc_query.go index 2e76899528..5c7186fb27 100644 --- a/x/epochs/keeper/grpc_query.go +++ b/x/epochs/keeper/grpc_query.go @@ -28,7 +28,7 @@ func NewQuerier(k Keeper) Querier { func (q Querier) EpochInfos(ctx context.Context, _ *types.QueryEpochInfosRequest) (*types.QueryEpochInfosResponse, error) { sdkCtx := sdk.UnwrapSDKContext(ctx) - epochs, err := q.Keeper.AllEpochInfos(sdkCtx) + epochs, err := q.AllEpochInfos(sdkCtx) return &types.QueryEpochInfosResponse{ Epochs: epochs, }, err @@ -43,7 +43,7 @@ func (q Querier) CurrentEpoch(ctx context.Context, req *types.QueryCurrentEpochR return nil, status.Error(codes.InvalidArgument, "identifier is empty") } - info, err := q.Keeper.EpochInfo.Get(ctx, req.Identifier) + info, err := q.EpochInfo.Get(ctx, req.Identifier) if err != nil { return nil, errors.New("not available identifier") } diff --git a/x/epochs/types/hooks_test.go b/x/epochs/types/hooks_test.go index 5ee22c1a18..c2b460aae7 100644 --- a/x/epochs/types/hooks_test.go +++ b/x/epochs/types/hooks_test.go @@ -86,14 +86,15 @@ func (s *KeeperTestSuite) TestHooksPanicRecovery() { hooks := types.NewMultiEpochHooks(hookRefs...) - if epochActionSelector == 0 { + switch epochActionSelector { + case 0: err := hooks.BeforeEpochStart(s.Ctx, "id", 0) if tc.expErr { s.Require().Error(err) } else { s.Require().NoError(err) } - } else if epochActionSelector == 1 { + case 1: err := hooks.AfterEpochEnd(s.Ctx, "id", 0) if tc.expErr { s.Require().Error(err) diff --git a/x/evidence/genesis_test.go b/x/evidence/genesis_test.go index 600f61cad7..6acedcd773 100644 --- a/x/evidence/genesis_test.go +++ b/x/evidence/genesis_test.go @@ -40,7 +40,7 @@ func (suite *GenesisTestSuite) SetupTest() { &evidenceKeeper) require.NoError(suite.T(), err) - suite.ctx = app.BaseApp.NewContextLegacy(false, cmtproto.Header{Height: 1}) + suite.ctx = app.NewContextLegacy(false, cmtproto.Header{Height: 1}) suite.keeper = evidenceKeeper } diff --git a/x/feegrant/keeper/msg_server.go b/x/feegrant/keeper/msg_server.go index 966f250545..2d69916dd9 100644 --- a/x/feegrant/keeper/msg_server.go +++ b/x/feegrant/keeper/msg_server.go @@ -82,7 +82,7 @@ func (k msgServer) RevokeAllowance(goCtx context.Context, msg *feegrant.MsgRevok return nil, err } - err = k.Keeper.revokeAllowance(ctx, granter, grantee) + err = k.revokeAllowance(ctx, granter, grantee) if err != nil { return nil, err } diff --git a/x/feegrant/simulation/operations_test.go b/x/feegrant/simulation/operations_test.go index 38316a6d29..7fbca98df4 100644 --- a/x/feegrant/simulation/operations_test.go +++ b/x/feegrant/simulation/operations_test.go @@ -79,7 +79,7 @@ func (suite *SimTestSuite) SetupTest() { ) suite.Require().NoError(err) - suite.ctx = suite.app.BaseApp.NewContextLegacy(false, cmtproto.Header{Time: time.Now()}) + suite.ctx = suite.app.NewContextLegacy(false, cmtproto.Header{Time: time.Now()}) } func (suite *SimTestSuite) getTestingAccounts(r *rand.Rand, n int) []simtypes.Account { diff --git a/x/gov/abci.go b/x/gov/abci.go index 870983e3e9..c67b923e8d 100644 --- a/x/gov/abci.go +++ b/x/gov/abci.go @@ -146,7 +146,7 @@ func EndBlocker(ctx sdk.Context, keeper *keeper.Keeper) error { // the deposit at this point since the proposal is converted to regular. // As a result, the deposits are either deleted or refunded in all cases // EXCEPT when an expedited proposal fails. - if !(proposal.Expedited && !passes) { + if !proposal.Expedited || passes { if burnDeposits { err = keeper.DeleteAndBurnDeposits(ctx, proposal.Id) } else { diff --git a/x/gov/abci_test.go b/x/gov/abci_test.go index b174c189d8..d4a564fd9e 100644 --- a/x/gov/abci_test.go +++ b/x/gov/abci_test.go @@ -24,7 +24,7 @@ import ( func TestUnregisteredProposal_InactiveProposalFails(t *testing.T) { suite := createTestSuite(t) - ctx := suite.App.BaseApp.NewContext(false) + ctx := suite.App.NewContext(false) addrs := simtestutil.AddTestAddrs(suite.BankKeeper, suite.StakingKeeper, ctx, 10, valTokens) // manually set proposal in store @@ -52,7 +52,7 @@ func TestUnregisteredProposal_InactiveProposalFails(t *testing.T) { func TestUnregisteredProposal_ActiveProposalFails(t *testing.T) { suite := createTestSuite(t) - ctx := suite.App.BaseApp.NewContext(false) + ctx := suite.App.NewContext(false) addrs := simtestutil.AddTestAddrs(suite.BankKeeper, suite.StakingKeeper, ctx, 10, valTokens) // manually set proposal in store @@ -84,7 +84,7 @@ func TestUnregisteredProposal_ActiveProposalFails(t *testing.T) { func TestTickExpiredDepositPeriod(t *testing.T) { suite := createTestSuite(t) app := suite.App - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) addrs := simtestutil.AddTestAddrs(suite.BankKeeper, suite.StakingKeeper, ctx, 10, valTokens) _, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{ @@ -136,7 +136,7 @@ func TestTickExpiredDepositPeriod(t *testing.T) { func TestTickMultipleExpiredDepositPeriod(t *testing.T) { suite := createTestSuite(t) app := suite.App - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) addrs := simtestutil.AddTestAddrs(suite.BankKeeper, suite.StakingKeeper, ctx, 10, valTokens) _, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{ @@ -208,7 +208,7 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) { func TestTickPassedDepositPeriod(t *testing.T) { suite := createTestSuite(t) app := suite.App - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) addrs := simtestutil.AddTestAddrs(suite.BankKeeper, suite.StakingKeeper, ctx, 10, valTokens) _, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{ @@ -271,7 +271,7 @@ func TestTickPassedVotingPeriod(t *testing.T) { t.Run(tc.name, func(t *testing.T) { suite := createTestSuite(t) app := suite.App - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) depositMultiplier := getDepositMultiplier(tc.expedited) addrs := simtestutil.AddTestAddrs(suite.BankKeeper, suite.StakingKeeper, ctx, 10, valTokens.Mul(math.NewInt(depositMultiplier))) @@ -363,7 +363,7 @@ func TestProposalPassedEndblocker(t *testing.T) { t.Run(tc.name, func(t *testing.T) { suite := createTestSuite(t) app := suite.App - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) depositMultiplier := getDepositMultiplier(tc.expedited) addrs := simtestutil.AddTestAddrs(suite.BankKeeper, suite.StakingKeeper, ctx, 10, valTokens.Mul(math.NewInt(depositMultiplier))) @@ -426,7 +426,7 @@ func TestProposalPassedEndblocker(t *testing.T) { func TestEndBlockerProposalHandlerFailed(t *testing.T) { suite := createTestSuite(t) app := suite.App - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) addrs := simtestutil.AddTestAddrs(suite.BankKeeper, suite.StakingKeeper, ctx, 1, valTokens) SortAddresses(addrs) @@ -508,7 +508,7 @@ func TestExpeditedProposal_PassAndConversionToRegular(t *testing.T) { t.Run(tc.name, func(t *testing.T) { suite := createTestSuite(t) app := suite.App - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) depositMultiplier := getDepositMultiplier(true) addrs := simtestutil.AddTestAddrs(suite.BankKeeper, suite.StakingKeeper, ctx, 3, valTokens.Mul(math.NewInt(depositMultiplier))) params, err := suite.GovKeeper.Params.Get(ctx) diff --git a/x/gov/genesis_test.go b/x/gov/genesis_test.go index f65bcce305..9382b2cdff 100644 --- a/x/gov/genesis_test.go +++ b/x/gov/genesis_test.go @@ -15,7 +15,7 @@ import ( func TestImportExportQueues_ErrorUnconsistentState(t *testing.T) { suite := createTestSuite(t) app := suite.App - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) require.Panics(t, func() { gov.InitGenesis(ctx, suite.AccountKeeper, suite.BankKeeper, suite.GovKeeper, &v1.GenesisState{ Deposits: v1.Deposits{ diff --git a/x/gov/keeper/deposit_test.go b/x/gov/keeper/deposit_test.go index 077d8da440..ef6da81eb9 100644 --- a/x/gov/keeper/deposit_test.go +++ b/x/gov/keeper/deposit_test.go @@ -377,9 +377,10 @@ func TestChargeDeposit(t *testing.T) { for _, tc := range testCases { for i := 0; i < 3; i++ { testName := func(i int) string { - if i == 0 { + switch i { + case 0: return fmt.Sprintf("%s and dest address is %s", tc.name, "nil") - } else if i == 1 { + case 1: return fmt.Sprintf("%s and dest address is normal address", tc.name) } return fmt.Sprintf("%s and dest address is community address", tc.name) diff --git a/x/gov/keeper/grpc_query.go b/x/gov/keeper/grpc_query.go index b42a114cfb..b4d6c197a4 100644 --- a/x/gov/keeper/grpc_query.go +++ b/x/gov/keeper/grpc_query.go @@ -256,11 +256,11 @@ func (q queryServer) TallyResult(ctx context.Context, req *v1.QueryTallyResultRe var tallyResult v1.TallyResult - switch { - case proposal.Status == v1.StatusDepositPeriod: + switch proposal.Status { + case v1.StatusDepositPeriod: tallyResult = v1.EmptyTallyResult() - case proposal.Status == v1.StatusPassed || proposal.Status == v1.StatusRejected || proposal.Status == v1.StatusFailed: + case v1.StatusPassed, v1.StatusRejected, v1.StatusFailed: tallyResult = *proposal.FinalTallyResult default: diff --git a/x/gov/keeper/msg_server.go b/x/gov/keeper/msg_server.go index 875b491369..c5d172e5c6 100644 --- a/x/gov/keeper/msg_server.go +++ b/x/gov/keeper/msg_server.go @@ -100,7 +100,7 @@ func (k msgServer) SubmitProposal(goCtx context.Context, msg *v1.MsgSubmitPropos "submit proposal", ) - votingStarted, err := k.Keeper.AddDeposit(ctx, proposal.Id, proposer, msg.GetInitialDeposit()) + votingStarted, err := k.AddDeposit(ctx, proposal.Id, proposer, msg.GetInitialDeposit()) if err != nil { return nil, err } @@ -160,11 +160,11 @@ func (k msgServer) ExecLegacyContent(goCtx context.Context, msg *v1.MsgExecLegac } // Ensure that the content has a respective handler - if !k.Keeper.legacyRouter.HasRoute(content.ProposalRoute()) { + if !k.legacyRouter.HasRoute(content.ProposalRoute()) { return nil, errors.Wrap(govtypes.ErrNoProposalHandlerExists, content.ProposalRoute()) } - handler := k.Keeper.legacyRouter.GetRoute(content.ProposalRoute()) + handler := k.legacyRouter.GetRoute(content.ProposalRoute()) if err := handler(ctx, content); err != nil { return nil, errors.Wrapf(govtypes.ErrInvalidProposalContent, "failed to run legacy handler %s, %+v", content.ProposalRoute(), err) } @@ -184,7 +184,7 @@ func (k msgServer) Vote(goCtx context.Context, msg *v1.MsgVote) (*v1.MsgVoteResp } ctx := sdk.UnwrapSDKContext(goCtx) - err = k.Keeper.AddVote(ctx, msg.ProposalId, accAddr, v1.NewNonSplitVoteOption(msg.Option), msg.Metadata) + err = k.AddVote(ctx, msg.ProposalId, accAddr, v1.NewNonSplitVoteOption(msg.Option), msg.Metadata) if err != nil { return nil, err } @@ -229,7 +229,7 @@ func (k msgServer) VoteWeighted(goCtx context.Context, msg *v1.MsgVoteWeighted) } ctx := sdk.UnwrapSDKContext(goCtx) - err := k.Keeper.AddVote(ctx, msg.ProposalId, accAddr, msg.Options, msg.Metadata) + err := k.AddVote(ctx, msg.ProposalId, accAddr, msg.Options, msg.Metadata) if err != nil { return nil, err } @@ -249,7 +249,7 @@ func (k msgServer) Deposit(goCtx context.Context, msg *v1.MsgDeposit) (*v1.MsgDe } ctx := sdk.UnwrapSDKContext(goCtx) - votingStarted, err := k.Keeper.AddDeposit(ctx, msg.ProposalId, accAddr, msg.Amount) + votingStarted, err := k.AddDeposit(ctx, msg.ProposalId, accAddr, msg.Amount) if err != nil { return nil, err } diff --git a/x/gov/simulation/operations_test.go b/x/gov/simulation/operations_test.go index 9ee9539d68..ba8c7b0335 100644 --- a/x/gov/simulation/operations_test.go +++ b/x/gov/simulation/operations_test.go @@ -434,7 +434,7 @@ func createTestSuite(t *testing.T, isCheckTx bool) (suite, sdk.Context) { &res.TxConfig, &res.AccountKeeper, &res.BankKeeper, &res.GovKeeper, &res.StakingKeeper, &res.DistributionKeeper) require.NoError(t, err) - ctx := app.BaseApp.NewContext(isCheckTx) + ctx := app.NewContext(isCheckTx) res.App = app return res, ctx diff --git a/x/gov/types/v1/proposal.go b/x/gov/types/v1/proposal.go index 1965824e51..de9fac413c 100644 --- a/x/gov/types/v1/proposal.go +++ b/x/gov/types/v1/proposal.go @@ -115,7 +115,7 @@ func (status ProposalStatus) Format(s fmt.State, verb rune) { _, _ = s.Write([]byte(status.String())) default: // TODO: Do this conversion more directly - _, _ = s.Write([]byte(fmt.Sprintf("%v", byte(status)))) + _, _ = fmt.Fprintf(s, "%v", byte(status)) } } diff --git a/x/gov/types/v1/vote.go b/x/gov/types/v1/vote.go index e5bc445966..547fc43c93 100644 --- a/x/gov/types/v1/vote.go +++ b/x/gov/types/v1/vote.go @@ -147,6 +147,6 @@ func (vo VoteOption) Format(s fmt.State, verb rune) { case 's': _, _ = s.Write([]byte(vo.String())) default: - _, _ = s.Write([]byte(fmt.Sprintf("%v", byte(vo)))) + _, _ = fmt.Fprintf(s, "%v", byte(vo)) } } diff --git a/x/gov/types/v1beta1/proposal.go b/x/gov/types/v1beta1/proposal.go index 8c90b910fb..ce2c7fa0b0 100644 --- a/x/gov/types/v1beta1/proposal.go +++ b/x/gov/types/v1beta1/proposal.go @@ -142,7 +142,7 @@ func (status ProposalStatus) Format(s fmt.State, verb rune) { case 's': _, _ = s.Write([]byte(status.String())) default: - _, _ = s.Write([]byte(fmt.Sprintf("%v", byte(status)))) + _, _ = fmt.Fprintf(s, "%v", byte(status)) } } diff --git a/x/gov/types/v1beta1/vote.go b/x/gov/types/v1beta1/vote.go index e681014f39..151c9da656 100644 --- a/x/gov/types/v1beta1/vote.go +++ b/x/gov/types/v1beta1/vote.go @@ -122,6 +122,6 @@ func (vo VoteOption) Format(s fmt.State, verb rune) { case 's': _, _ = s.Write([]byte(vo.String())) default: - _, _ = s.Write([]byte(fmt.Sprintf("%v", byte(vo)))) + _, _ = fmt.Fprintf(s, "%v", byte(vo)) } } diff --git a/x/group/internal/orm/primary_key.go b/x/group/internal/orm/primary_key.go index 5bf6a2b839..e8f30d6beb 100644 --- a/x/group/internal/orm/primary_key.go +++ b/x/group/internal/orm/primary_key.go @@ -106,7 +106,7 @@ func (a PrimaryKeyTable) Has(store storetypes.KVStore, primaryKey RowID) bool { // Contains returns true when an object with same type and primary key is persisted in this table. func (a PrimaryKeyTable) Contains(store storetypes.KVStore, obj PrimaryKeyed) bool { - if err := assertCorrectType(a.table.model, obj); err != nil { + if err := assertCorrectType(a.model, obj); err != nil { return false } return a.table.Has(store, PrimaryKey(obj)) diff --git a/x/group/keeper/keeper.go b/x/group/keeper/keeper.go index 8c8f54e094..a085f540ba 100644 --- a/x/group/keeper/keeper.go +++ b/x/group/keeper/keeper.go @@ -409,7 +409,8 @@ func (k Keeper) TallyProposalsAtVPEnd(ctx sdk.Context) error { } proposalID := proposal.Id - if proposal.Status == group.PROPOSAL_STATUS_ABORTED || proposal.Status == group.PROPOSAL_STATUS_WITHDRAWN { + switch proposal.Status { + case group.PROPOSAL_STATUS_ABORTED, group.PROPOSAL_STATUS_WITHDRAWN: if err := k.pruneProposal(ctx, proposalID); err != nil { return err } @@ -424,7 +425,7 @@ func (k Keeper) TallyProposalsAtVPEnd(ctx sdk.Context) error { }); err != nil { return err } - } else if proposal.Status == group.PROPOSAL_STATUS_SUBMITTED { + case group.PROPOSAL_STATUS_SUBMITTED: if err := k.doTallyAndUpdate(ctx, &proposal, electorate, policyInfo); err != nil { return errorsmod.Wrap(err, "doTallyAndUpdate") } diff --git a/x/group/keeper/msg_server_test.go b/x/group/keeper/msg_server_test.go index cc1039bd82..5fb4a7bf53 100644 --- a/x/group/keeper/msg_server_test.go +++ b/x/group/keeper/msg_server_test.go @@ -1895,7 +1895,7 @@ func (s *TestSuite) TestSubmitProposal() { s.Require().NoError(err) id := res.ProposalId - if !(spec.expProposal.ExecutorResult == group.PROPOSAL_EXECUTOR_RESULT_SUCCESS) { + if spec.expProposal.ExecutorResult != group.PROPOSAL_EXECUTOR_RESULT_SUCCESS { // then all data persisted proposalRes, err := s.groupKeeper.Proposal(s.ctx, &group.QueryProposalRequest{ProposalId: id}) s.Require().NoError(err) @@ -2410,7 +2410,7 @@ func (s *TestSuite) TestVote() { } s.Require().NoError(err) - if !(spec.expExecutorResult == group.PROPOSAL_EXECUTOR_RESULT_SUCCESS) { + if spec.expExecutorResult != group.PROPOSAL_EXECUTOR_RESULT_SUCCESS { // vote is stored and all data persisted res, err := s.groupKeeper.VoteByProposalVoter(sdkCtx, &group.QueryVoteByProposalVoterRequest{ ProposalId: spec.req.ProposalId, @@ -2762,7 +2762,7 @@ func (s *TestSuite) TestExecProposal() { } s.Require().NoError(err) - if !(spec.expExecutorResult == group.PROPOSAL_EXECUTOR_RESULT_SUCCESS) { + if spec.expExecutorResult != group.PROPOSAL_EXECUTOR_RESULT_SUCCESS { // and proposal is updated res, err := s.groupKeeper.Proposal(sdkCtx, &group.QueryProposalRequest{ProposalId: proposalID}) diff --git a/x/group/module/abci_test.go b/x/group/module/abci_test.go index 0afbea0173..f7305fe54c 100644 --- a/x/group/module/abci_test.go +++ b/x/group/module/abci_test.go @@ -58,7 +58,7 @@ func (s *IntegrationTestSuite) SetupTest() { ) s.Require().NoError(err) - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) ctx = ctx.WithBlockHeader(cmtproto.Header{Time: cmttime.Now()}) diff --git a/x/group/simulation/operations_test.go b/x/group/simulation/operations_test.go index 1a5f3ce18a..dbd43b490f 100644 --- a/x/group/simulation/operations_test.go +++ b/x/group/simulation/operations_test.go @@ -58,7 +58,7 @@ func (suite *SimTestSuite) SetupTest() { suite.Require().NoError(err) suite.app = app - suite.ctx = app.BaseApp.NewContext(false) + suite.ctx = app.NewContext(false) } func (suite *SimTestSuite) TestWeightedOperations() { diff --git a/x/mint/module_test.go b/x/mint/module_test.go index 6ae3df35a9..d87f075355 100644 --- a/x/mint/module_test.go +++ b/x/mint/module_test.go @@ -25,7 +25,7 @@ func TestItCreatesModuleAccountOnInitBlock(t *testing.T) { ), &accountKeeper) require.NoError(t, err) - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) acc := accountKeeper.GetAccount(ctx, authtypes.NewModuleAddress(types.ModuleName)) require.NotNil(t, acc) } diff --git a/x/nft/simulation/operations_test.go b/x/nft/simulation/operations_test.go index 1d67ff0288..15de260f6e 100644 --- a/x/nft/simulation/operations_test.go +++ b/x/nft/simulation/operations_test.go @@ -60,7 +60,7 @@ func (suite *SimTestSuite) SetupTest() { suite.Require().NoError(err) suite.app = app - suite.ctx = app.BaseApp.NewContext(false) + suite.ctx = app.NewContext(false) } func (suite *SimTestSuite) TestWeightedOperations() { diff --git a/x/simulation/mock_cometbft.go b/x/simulation/mock_cometbft.go index 23504bc3b4..dbcf245432 100644 --- a/x/simulation/mock_cometbft.go +++ b/x/simulation/mock_cometbft.go @@ -141,12 +141,13 @@ func RandomRequestFinalizeBlock( mVal.livenessState = params.LivenessTransitionMatrix().NextState(r, mVal.livenessState) signed := true - if mVal.livenessState == 1 { + switch mVal.livenessState { + case 1: // spotty connection, 50% probability of success // See https://github.com/golang/go/issues/23804#issuecomment-365370418 // for reasoning behind computing like this signed = r.Int63()%2 == 0 - } else if mVal.livenessState == 2 { + case 2: // offline signed = false } diff --git a/x/slashing/abci_test.go b/x/slashing/abci_test.go index 477df081fc..be31c5e758 100644 --- a/x/slashing/abci_test.go +++ b/x/slashing/abci_test.go @@ -43,7 +43,7 @@ func TestBeginBlocker(t *testing.T) { ) require.NoError(t, err) - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) pks := simtestutil.CreateTestPubKeys(1) simtestutil.AddTestAddrsFromPubKeys(bankKeeper, stakingKeeper, ctx, pks, stakingKeeper.TokensFromConsensusPower(ctx, 200)) diff --git a/x/slashing/app_test.go b/x/slashing/app_test.go index 58922d0060..06679bc420 100644 --- a/x/slashing/app_test.go +++ b/x/slashing/app_test.go @@ -103,7 +103,7 @@ func TestSlashingMsgs(t *testing.T) { require.True(math.IntEq(t, bondTokens, validator.BondedTokens())) unjailMsg := &types.MsgUnjail{ValidatorAddr: sdk.ValAddress(addr1).String()} - ctxCheck = app.BaseApp.NewContext(true) + ctxCheck = app.NewContext(true) _, err = slashingKeeper.GetValidatorSigningInfo(ctxCheck, sdk.ConsAddress(valAddr)) require.NoError(t, err) diff --git a/x/slashing/keeper/slash_redelegation_test.go b/x/slashing/keeper/slash_redelegation_test.go index f5ec2cb282..2cbd0632cd 100644 --- a/x/slashing/keeper/slash_redelegation_test.go +++ b/x/slashing/keeper/slash_redelegation_test.go @@ -38,7 +38,7 @@ func TestSlashRedelegation(t *testing.T) { require.NoError(t, err) // get sdk context, staking msg server and bond denom - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) stakingMsgServer := stakingkeeper.NewMsgServerImpl(stakingKeeper) bondDenom, err := stakingKeeper.BondDenom(ctx) require.NoError(t, err) diff --git a/x/slashing/simulation/operations_test.go b/x/slashing/simulation/operations_test.go index 8e24baff4d..140ac3f010 100644 --- a/x/slashing/simulation/operations_test.go +++ b/x/slashing/simulation/operations_test.go @@ -99,7 +99,7 @@ func (suite *SimTestSuite) SetupTest() { suite.Require().NoError(err) suite.app = app - suite.ctx = app.BaseApp.NewContext(false) + suite.ctx = app.NewContext(false) // remove genesis validator account suite.accounts = accounts[1:] diff --git a/x/staking/app_test.go b/x/staking/app_test.go index ae68287c40..66133df97c 100644 --- a/x/staking/app_test.go +++ b/x/staking/app_test.go @@ -61,7 +61,7 @@ func TestStakingMsgs(t *testing.T) { ), startupCfg, &bankKeeper, &stakingKeeper) require.NoError(t, err) - ctxCheck := app.BaseApp.NewContext(true) + ctxCheck := app.NewContext(true) require.True(t, sdk.Coins{genCoin}.Equal(bankKeeper.GetAllBalances(ctxCheck, addr1))) require.True(t, sdk.Coins{genCoin}.Equal(bankKeeper.GetAllBalances(ctxCheck, addr2))) @@ -81,7 +81,7 @@ func TestStakingMsgs(t *testing.T) { _, err = app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: app.LastBlockHeight() + 1}) require.NoError(t, err) - ctxCheck = app.BaseApp.NewContext(true) + ctxCheck = app.NewContext(true) validator, err := stakingKeeper.GetValidator(ctxCheck, sdk.ValAddress(addr1)) require.NoError(t, err) @@ -100,7 +100,7 @@ func TestStakingMsgs(t *testing.T) { _, _, err = simtestutil.SignCheckDeliver(t, txConfig, app.BaseApp, header, []sdk.Msg{editValidatorMsg}, "", []uint64{0}, []uint64{1}, true, true, priv1) require.NoError(t, err) - ctxCheck = app.BaseApp.NewContext(true) + ctxCheck = app.NewContext(true) validator, err = stakingKeeper.GetValidator(ctxCheck, sdk.ValAddress(addr1)) require.NoError(t, err) require.Equal(t, description, validator.Description) @@ -113,7 +113,7 @@ func TestStakingMsgs(t *testing.T) { _, _, err = simtestutil.SignCheckDeliver(t, txConfig, app.BaseApp, header, []sdk.Msg{delegateMsg}, "", []uint64{1}, []uint64{0}, true, true, priv2) require.NoError(t, err) - ctxCheck = app.BaseApp.NewContext(true) + ctxCheck = app.NewContext(true) require.True(t, sdk.Coins{genCoin.Sub(bondCoin)}.Equal(bankKeeper.GetAllBalances(ctxCheck, addr2))) _, err = stakingKeeper.GetDelegation(ctxCheck, addr2, sdk.ValAddress(addr1)) require.NoError(t, err) @@ -125,7 +125,7 @@ func TestStakingMsgs(t *testing.T) { require.NoError(t, err) // delegation should exist anymore - ctxCheck = app.BaseApp.NewContext(true) + ctxCheck = app.NewContext(true) _, err = stakingKeeper.GetDelegation(ctxCheck, addr2, sdk.ValAddress(addr1)) require.ErrorIs(t, err, types.ErrNoDelegation) diff --git a/x/staking/keeper/grpc_query.go b/x/staking/keeper/grpc_query.go index 890ca859c1..26801cacf7 100644 --- a/x/staking/keeper/grpc_query.go +++ b/x/staking/keeper/grpc_query.go @@ -34,7 +34,7 @@ func (k Querier) Validators(ctx context.Context, req *types.QueryValidatorsReque } // validate the provided status, return all the validators if the status is empty - if req.Status != "" && !(req.Status == types.Bonded.String() || req.Status == types.Unbonded.String() || req.Status == types.Unbonding.String()) { + if req.Status != "" && (req.Status != types.Bonded.String() && req.Status != types.Unbonded.String() && req.Status != types.Unbonding.String()) { return nil, status.Errorf(codes.InvalidArgument, "invalid validator status %s", req.Status) } diff --git a/x/staking/module_test.go b/x/staking/module_test.go index 37c4063fa2..c254528ce7 100644 --- a/x/staking/module_test.go +++ b/x/staking/module_test.go @@ -24,7 +24,7 @@ func TestItCreatesModuleAccountOnInitBlock(t *testing.T) { ), &accountKeeper) require.NoError(t, err) - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) acc := accountKeeper.GetAccount(ctx, authtypes.NewModuleAddress(types.BondedPoolName)) require.NotNil(t, acc) diff --git a/x/staking/simulation/genesis_test.go b/x/staking/simulation/genesis_test.go index d3b74e5758..1b3f5c10f2 100644 --- a/x/staking/simulation/genesis_test.go +++ b/x/staking/simulation/genesis_test.go @@ -64,9 +64,9 @@ func TestRandomizedGenState(t *testing.T) { require.Equal(t, "BOND_STATUS_UNBONDED", stakingGenesis.Validators[2].Status.String()) require.Equal(t, "1000", stakingGenesis.Validators[2].Tokens.String()) require.Equal(t, "1000.000000000000000000", stakingGenesis.Validators[2].DelegatorShares.String()) - require.Equal(t, "0.292059246265731326", stakingGenesis.Validators[2].Commission.CommissionRates.Rate.String()) - require.Equal(t, "0.330000000000000000", stakingGenesis.Validators[2].Commission.CommissionRates.MaxRate.String()) - require.Equal(t, "0.038337453731274481", stakingGenesis.Validators[2].Commission.CommissionRates.MaxChangeRate.String()) + require.Equal(t, "0.292059246265731326", stakingGenesis.Validators[2].Commission.Rate.String()) + require.Equal(t, "0.330000000000000000", stakingGenesis.Validators[2].Commission.MaxRate.String()) + require.Equal(t, "0.038337453731274481", stakingGenesis.Validators[2].Commission.MaxChangeRate.String()) require.Equal(t, "1", stakingGenesis.Validators[2].MinSelfDelegation.String()) } diff --git a/x/staking/simulation/operations_test.go b/x/staking/simulation/operations_test.go index 9d1960a151..82961990f4 100644 --- a/x/staking/simulation/operations_test.go +++ b/x/staking/simulation/operations_test.go @@ -96,7 +96,7 @@ func (s *SimTestSuite) SetupTest() { app, err := simtestutil.SetupWithConfiguration(cfg, startupCfg, &s.txConfig, &bankKeeper, &accountKeeper, &mintKeeper, &distrKeeper, &stakingKeeper) require.NoError(s.T(), err) - ctx := app.BaseApp.NewContext(false) + ctx := app.NewContext(false) s.Require().NoError(mintKeeper.Params.Set(ctx, minttypes.DefaultParams())) s.Require().NoError(mintKeeper.Minter.Set(ctx, minttypes.DefaultInitialMinter())) diff --git a/x/tx/signing/textual/bool.go b/x/tx/signing/textual/bool.go index 2347ef1dd4..cbc5629a16 100644 --- a/x/tx/signing/textual/bool.go +++ b/x/tx/signing/textual/bool.go @@ -28,10 +28,7 @@ func (sr boolValueRenderer) Parse(_ context.Context, screens []Screen) (protoref return protoreflect.Value{}, fmt.Errorf("expected single screen: %v", screens) } - res := false - if screens[0].Content == "True" { - res = true - } + res := screens[0].Content == "True" return protoreflect.ValueOfBool(res), nil }