From 85db26f3525636f14165f2deba2437fd69fe67b0 Mon Sep 17 00:00:00 2001 From: Ilya Raykker Date: Tue, 24 Sep 2024 10:18:29 +0200 Subject: [PATCH] Fix linter errors --- .golangci.yml | 3 +++ app/upgrades/v1.15/upgrade.go | 12 ++++++------ cmd/secretd/attestation.go | 6 +++--- x/compute/internal/keeper/keeper.go | 6 +++--- x/emergencybutton/keeper/genesis.go | 2 +- x/emergencybutton/keeper/keeper.go | 9 ++++----- x/emergencybutton/keeper/params.go | 2 +- x/emergencybutton/migrations/v2/migrate.go | 4 +--- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index f5f2f04a2..44617d1a2 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -46,3 +46,6 @@ issues: - text: "// nolint` should be written without leading space as `//nolint" linters: - nolintlint + - text: "G115:" + linters: + - gosec diff --git a/app/upgrades/v1.15/upgrade.go b/app/upgrades/v1.15/upgrade.go index f2f0d0b5f..60fe5b376 100644 --- a/app/upgrades/v1.15/upgrade.go +++ b/app/upgrades/v1.15/upgrade.go @@ -25,7 +25,7 @@ import ( icacontrollertypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/types" icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" - ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck ibcconntypes "github.com/cosmos/ibc-go/v8/modules/core/03-connection/types" ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" ibcswitchtypes "github.com/scrtlabs/SecretNetwork/x/emergencybutton/types" @@ -80,18 +80,18 @@ func createUpgradeHandler(mm *module.Manager, appKeepers *keepers.SecretAppKeepe case govtypes.ModuleName: keyTable = govv1.ParamKeyTable() //nolint:staticcheck case ibcswitchtypes.ModuleName: - keyTable = ibcswitchtypes.ParamKeyTable() //nolint:staticcheck + keyTable = ibcswitchtypes.ParamKeyTable() case crisistypes.ModuleName: keyTable = crisistypes.ParamKeyTable() //nolint:staticcheck case ibcexported.ModuleName: - keyTable = ibcclienttypes.ParamKeyTable() //nolint:staticcheck + keyTable = ibcclienttypes.ParamKeyTable() keyTable.RegisterParamSet(&ibcconntypes.Params{}) case ibctransfertypes.ModuleName: - keyTable = ibctransfertypes.ParamKeyTable() //nolint:staticcheck + keyTable = ibctransfertypes.ParamKeyTable() case icacontrollertypes.SubModuleName: - keyTable = icacontrollertypes.ParamKeyTable() //nolint:staticcheck + keyTable = icacontrollertypes.ParamKeyTable() case icahosttypes.SubModuleName: - keyTable = icahosttypes.ParamKeyTable() //nolint:staticcheck + keyTable = icahosttypes.ParamKeyTable() default: continue } diff --git a/cmd/secretd/attestation.go b/cmd/secretd/attestation.go index d95588f5c..71b3e2d4d 100644 --- a/cmd/secretd/attestation.go +++ b/cmd/secretd/attestation.go @@ -549,15 +549,15 @@ Please report any issues with this command errDetails := ErrorResponse{} err := json.Unmarshal(body, &errDetails) if err != nil { - return fmt.Errorf(fmt.Sprintf("Registration TX was not successful - %s", err)) + return fmt.Errorf("registration TX was not successful - %s", err) } - return fmt.Errorf(fmt.Sprintf("Registration TX was not successful - %s", errDetails.Details)) + return fmt.Errorf("registration TX was not successful - %s", errDetails.Details) } details := OkayResponse{} err = json.Unmarshal(body, &details) if err != nil { - return fmt.Errorf(fmt.Sprintf("Error getting seed from registration service - %s", err)) + return fmt.Errorf("error getting seed from registration service - %s", err) } seed := details.Details.Value diff --git a/x/compute/internal/keeper/keeper.go b/x/compute/internal/keeper/keeper.go index 3301e650d..a7482d17c 100644 --- a/x/compute/internal/keeper/keeper.go +++ b/x/compute/internal/keeper/keeper.go @@ -17,7 +17,7 @@ import ( portkeeper "github.com/cosmos/ibc-go/v8/modules/core/05-port/keeper" porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types" wasmTypes "github.com/scrtlabs/SecretNetwork/go-cosmwasm/types" - "golang.org/x/crypto/ripemd160" //nolint:staticcheck + "golang.org/x/crypto/ripemd160" //nolint "github.com/cosmos/cosmos-sdk/telemetry" @@ -1173,8 +1173,8 @@ func contractAddress(codeID, instanceID uint64, creator sdk.AccAddress) sdk.AccA hashSourceBytes = append(hashSourceBytes, creator...) sha := sha256.Sum256(hashSourceBytes) - hasherRIPEMD160 := ripemd160.New() - hasherRIPEMD160.Write(sha[:]) // does not error + hasherRIPEMD160 := ripemd160.New() //nolint + hasherRIPEMD160.Write(sha[:]) // does not error return sdk.AccAddress(hasherRIPEMD160.Sum(nil)) } diff --git a/x/emergencybutton/keeper/genesis.go b/x/emergencybutton/keeper/genesis.go index 24580f07a..e116cf0b8 100644 --- a/x/emergencybutton/keeper/genesis.go +++ b/x/emergencybutton/keeper/genesis.go @@ -9,7 +9,7 @@ import ( // InitGenesis initializes the x/emergencybutton's module's state from a provided genesis // state, which includes the parameter for the pauser address and for the switch status. func (i *Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) { - i.SetParams(ctx, genState.Params) + i.SetParams(ctx, genState.Params) //nolint:errcheck } // ExportGenesis returns the x/emergencybutton module's exported genesis. diff --git a/x/emergencybutton/keeper/keeper.go b/x/emergencybutton/keeper/keeper.go index fd4017ea4..518dd4bc1 100644 --- a/x/emergencybutton/keeper/keeper.go +++ b/x/emergencybutton/keeper/keeper.go @@ -2,12 +2,11 @@ package keeper import ( "cosmossdk.io/errors" + storetypes "cosmossdk.io/store/types" codec "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" - //nolint:staticcheck - storetypes "cosmossdk.io/store/types" - ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types" "github.com/cosmos/ibc-go/v8/modules/core/exported" "github.com/scrtlabs/SecretNetwork/x/emergencybutton/types" @@ -61,6 +60,6 @@ func (i *Keeper) IsHalted(ctx sdk.Context) bool { } // GetAuthority returns the x/emergencybutton module's authority. -func (k Keeper) GetAuthority() string { - return k.authority +func (i Keeper) GetAuthority() string { + return i.authority } diff --git a/x/emergencybutton/keeper/params.go b/x/emergencybutton/keeper/params.go index 92cb8b7a7..5c16e8d7f 100644 --- a/x/emergencybutton/keeper/params.go +++ b/x/emergencybutton/keeper/params.go @@ -27,7 +27,7 @@ func (i *Keeper) GetSwitchStatus(ctx sdk.Context) (status string) { func (i *Keeper) SetSwitchStatus(ctx sdk.Context, value string) { params := i.GetParams(ctx) params.SwitchStatus = value - i.SetParams(ctx, params) + i.SetParams(ctx, params) //nolint:errcheck } // SetParams sets the x/emergencybutton module parameters. diff --git a/x/emergencybutton/migrations/v2/migrate.go b/x/emergencybutton/migrations/v2/migrate.go index 85ad87ae5..cb410ee5a 100644 --- a/x/emergencybutton/migrations/v2/migrate.go +++ b/x/emergencybutton/migrations/v2/migrate.go @@ -12,9 +12,7 @@ const ( ModuleName = "emergencybutton" ) -var ( - ParamsKey = []byte{0x01} -) +var ParamsKey = []byte{0x01} // Migrate migrates the x/emergencybutton module state from the consensus version 1 to // version 2. Specifically, it takes the parameters that are currently stored