Skip to content

Commit

Permalink
chore: make format code (#185)
Browse files Browse the repository at this point in the history
  • Loading branch information
zakir-code authored Feb 2, 2024
1 parent 5e98dc6 commit 3480789
Show file tree
Hide file tree
Showing 52 changed files with 130 additions and 122 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/lint_golang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ on:
push:
tags:
- v*
branches:
- main
paths:
- '**.go'
- 'go.mod'
- 'go.sum'
- '.golangci.yml'
pull_request:
paths:
- '**.go'
- 'go.mod'
- 'go.sum'
- '.golangci.yml'

permissions:
contents: read
Expand All @@ -34,5 +34,5 @@ jobs:
go-version: 1.21
- uses: golangci/golangci-lint-action@v3
with:
version: v1.54.2
version: v1.55.2
args: --timeout 10m
9 changes: 7 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ run:
tests: true

# Define the Go version limit.
# Mainly related to generics support since go1.19.
# Default: use Go version from the go.mod file, fallback on the env var `GOVERSION`, fallback on 1.19
# Mainly related to generics support since go1.21.
# Default: use Go version from the go.mod file, fallback on the env var `GOVERSION`, fallback on 1.21
go: '1.21'

linters:
Expand All @@ -19,6 +19,9 @@ linters:
- unparam
- stylecheck
- gocyclo
- errorlint
- prealloc
- gocritic
- gci
- dogsled
- gosec
Expand All @@ -29,6 +32,8 @@ linters-settings:
checks: ["all", "-ST1003"]
gocyclo:
min-complexity: 15
gocritic:
disabled-checks: ["assignOp", "ifElseChain", "appendAssign"]
gci:
custom-order: true
sections:
Expand Down
19 changes: 12 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -132,23 +132,28 @@ run-local: install
### Linting ###
###############################################################################

golangci_lint_cmd=golangci-lint
golangci_version=v1.54.2
golangci_version=v1.55.2

lint-install:
@echo "--> Installing golangci-lint $(golangci_version)"
go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
@if golangci-lint version --format json | jq .version | grep -q $(golangci_version); then \
echo "golangci-lint $(golangci_version) is already installed"; \
else \
echo "Installing golangci-lint $(golangci_version)"; \
go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version); \
fi

lint:
lint: lint-install
echo "--> Running linter"
$(MAKE) lint-install
$(golangci_lint_cmd) run --build-tags=$(GO_BUILD) --fix --out-format=tab
@if [ $$(find . -name '*.go' -type f | xargs grep 'nolint\|#nosec' | wc -l) -ne 42 ]; then \
@golangci-lint run --build-tags=$(GO_BUILD) --out-format=tab
@if [ $$(find . -name '*.go' -type f | xargs grep 'nolint\|#nosec' | wc -l) -ne 40 ]; then \
echo "--> increase or decrease nolint, please recheck them"; \
echo "--> list nolint: \`find . -name '*.go' -type f | xargs grep 'nolint\|#nosec'\`"; exit 1;\
fi

format: lint
format: lint-install
@golangci-lint run --build-tags=$(GO_BUILD) --out-format=tab --fix

lint-shell:
# install shellcheck > https://github.com/koalaman/shellcheck
Expand Down
2 changes: 1 addition & 1 deletion ante/ante_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ func (suite *AnteTestSuite) CreateTestTxBuilder(msg *evmtypes.MsgEthereumTx, pri
func (suite *AnteTestSuite) CreateEmptyTestTx(txBuilder client.TxBuilder, privs []cryptotypes.PrivKey, accNums []uint64, accSeqs []uint64) (authsigning.Tx, error) {
cliCtx := NewClientCtx()
signMode := cliCtx.TxConfig.SignModeHandler().DefaultMode()
var sigsV2 []signing.SignatureV2
sigsV2 := make([]signing.SignatureV2, 0, len(privs))
for i, priv := range privs {
sigV2 := signing.SignatureV2{
PubKey: priv.PubKey(),
Expand Down
4 changes: 2 additions & 2 deletions ante/fees.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type DeductFeeDecorator struct {
MaxBypassMinFeeMsgGasUsage uint64
}

func NewDeductFeeDecorator(ak AccountKeeper, bk types.BankKeeper, fk FeegrantKeeper, tfc ante.TxFeeChecker, bypassMsgTypes []string, MaxBypassMinFeeMsgGasUsage uint64) DeductFeeDecorator {
func NewDeductFeeDecorator(ak AccountKeeper, bk types.BankKeeper, fk FeegrantKeeper, tfc ante.TxFeeChecker, bypassMsgTypes []string, maxBypassMinFeeMsgGasUsage uint64) DeductFeeDecorator {
if tfc == nil {
tfc = checkTxFeeWithValidatorMinGasPrices
}
Expand All @@ -43,7 +43,7 @@ func NewDeductFeeDecorator(ak AccountKeeper, bk types.BankKeeper, fk FeegrantKee
feegrantKeeper: fk,
txFeeChecker: tfc,
BypassMinFeeMsgTypes: bypassMsgTypes,
MaxBypassMinFeeMsgGasUsage: MaxBypassMinFeeMsgGasUsage,
MaxBypassMinFeeMsgGasUsage: maxBypassMinFeeMsgGasUsage,
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func New(
}

if err := anteOptions.Validate(); err != nil {
panic(fmt.Errorf("failed to ante options validate: %s", err))
panic(fmt.Errorf("failed to ante options validate: %w", err))
}

myApp.SetAnteHandler(fxante.NewAnteHandler(anteOptions))
Expand Down
12 changes: 6 additions & 6 deletions client/cli/block_result.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,21 @@ func ParseBlockResults(cdc codec.JSONCodec, blockResults *coretypes.ResultBlockR
if err != nil {
return nil, err
}
var beginBlockEvents []map[string]interface{}
beginBlockEvents := make([]map[string]interface{}, 0, len(blockResults.BeginBlockEvents))
for _, event := range blockResults.BeginBlockEvents {
beginBlockEvents = append(beginBlockEvents, map[string]interface{}{
"type": event.Type,
"attributes": AttributesToMap(event.Attributes),
})
}
var endBlockEvents []map[string]interface{}
endBlockEvents := make([]map[string]interface{}, 0, len(blockResults.EndBlockEvents))
for _, event := range blockResults.EndBlockEvents {
endBlockEvents = append(endBlockEvents, map[string]interface{}{
"type": event.Type,
"attributes": AttributesToMap(event.Attributes),
})
}
var txsResults []map[string]interface{}
txsResults := make([]map[string]interface{}, 0, len(blockResults.TxsResults))
for _, txResult := range blockResults.TxsResults {
txsResults = append(txsResults, TxResultToMap(cdc, txResult))
}
Expand All @@ -106,7 +106,7 @@ func TxResponseToMap(cdc codec.JSONCodec, txResponse *sdk.TxResponse) map[string
if txResponse == nil {
return map[string]interface{}{}
}
var txResultEvents []map[string]interface{}
txResultEvents := make([]map[string]interface{}, 0, len(txResponse.Events))
for _, event := range txResponse.Events {
txResultEvents = append(txResultEvents, map[string]interface{}{
"type": event.Type,
Expand Down Expand Up @@ -153,7 +153,7 @@ func TxResultToMap(cdc codec.JSONCodec, txResult *types.ResponseDeliverTx) map[s
if txResult == nil {
return map[string]interface{}{}
}
var txResultEvents []map[string]interface{}
txResultEvents := make([]map[string]interface{}, 0, len(txResult.Events))
for _, event := range txResult.Events {
txResultEvents = append(txResultEvents, map[string]interface{}{
"type": event.Type,
Expand Down Expand Up @@ -183,7 +183,7 @@ func TxResultToMap(cdc codec.JSONCodec, txResult *types.ResponseDeliverTx) map[s
}

func AttributesToMap(attrs []types.EventAttribute) []map[string]interface{} {
var attributes []map[string]interface{}
attributes := make([]map[string]interface{}, 0, len(attrs))
for _, attribute := range attrs {
attributes = append(attributes, map[string]interface{}{
"index": attribute.Index,
Expand Down
2 changes: 1 addition & 1 deletion client/cli/debug.go
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ $ %s debug pubkey '{"@type":"/cosmos.crypto.ed25519.PubKey","key":"eKlxn6Xoe9LNm
RunE: func(cmd *cobra.Command, args []string) (err error) {
clientCtx := client.GetClientContextFromCmd(cmd)
var pubkey cryptotypes.PubKey
if len(args) <= 0 {
if len(args) == 0 {
serverCtx := server.GetServerContextFromCmd(cmd)
serverCfg := serverCtx.Config
privValidator := privval.LoadFilePV(serverCfg.PrivValidatorKeyFile(), serverCfg.PrivValidatorStateFile())
Expand Down
7 changes: 4 additions & 3 deletions client/cli/keys/import_export.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,12 @@ func ImportKeyCommand() *cobra.Command {
}
algoStr, _ := cmd.Flags().GetString(flags.FlagKeyAlgorithm)
var armoPrivKey string
if hd.PubKeyType(algoStr) == hd.Secp256k1Type {
switch hd.PubKeyType(algoStr) {
case hd.Secp256k1Type:
armoPrivKey = crypto.EncryptArmorPrivKey(&secp256k1.PrivKey{Key: ethcrypto.FromECDSA(priv)}, "", string(hd.Secp256k1Type))
} else if hd.PubKeyType(algoStr) == hd2.EthSecp256k1Type {
case hd2.EthSecp256k1Type:
armoPrivKey = crypto.EncryptArmorPrivKey(&ethsecp256k1.PrivKey{Key: ethcrypto.FromECDSA(priv)}, "", string(hd2.EthSecp256k1Type))
} else {
default:
return fmt.Errorf("provided algorithm %q is not supported", algoStr)
}

Expand Down
2 changes: 1 addition & 1 deletion client/cli/keys/output.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func checksumHex(addr []byte) []byte {
buf[i] -= 32
}
}
return buf[:]
return buf
}

// MkConsKeyOutput create a KeyOutput in with "cons" Bech32 prefixes.
Expand Down
4 changes: 2 additions & 2 deletions client/cli/keys/show.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ func runShowCmd(cmd *cobra.Command, args []string) (err error) {
if len(args) == 1 {
k, err = fetchKey(clientCtx.Keyring, args[0])
if err != nil {
return fmt.Errorf("%s is not a valid name or address: %v", args[0], err)
return fmt.Errorf("%s is not a valid name or address: %w", args[0], err)
}
} else {
pks := make([]cryptotypes.PubKey, len(args))
for i, keyref := range args {
k, err := fetchKey(clientCtx.Keyring, keyref)
if err != nil {
return fmt.Errorf("%s is not a valid name or address: %v", keyref, err)
return fmt.Errorf("%s is not a valid name or address: %w", keyref, err)
}
key, err := k.GetPubKey()
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion client/eth_tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func BuildEthTransaction(ctx context.Context, cli *ethclient.Client, priKey cryp
msg := ethereum.CallMsg{From: sender, To: to, GasPrice: gasPrice, GasTipCap: gasTipCap, GasFeeCap: gasFeeCap, Value: value, Data: data}
gasLimit, err := cli.EstimateGas(ctx, msg)
if err != nil {
return nil, fmt.Errorf("failed to estimate gas needed: %v", err)
return nil, fmt.Errorf("failed to estimate gas needed: %w", err)
}
gasLimit = gasLimit * 130 / 100
if value == nil {
Expand Down
2 changes: 1 addition & 1 deletion client/grpc/grpc_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ func (cli *Client) GetAddressPrefix() (string, error) {
if err != nil {
return "", err
}
if len(response.GetValidators()) <= 0 {
if len(response.GetValidators()) == 0 {
return "", errors.New("no found validator")
}
prefix, _, err := bech32.DecodeAndConvert(response.GetValidators()[0].GetAddress())
Expand Down
8 changes: 4 additions & 4 deletions client/jsonrpc/json_rpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func (c *NodeRPC) GetAddressPrefix() (prefix string, err error) {
if err = json.Unmarshal(appState[authtypes.ModuleName], &authGen); err != nil {
return
}
if len(authGen.Accounts) <= 0 {
if len(authGen.Accounts) == 0 {
return sdk.Bech32MainPrefix, nil
}
c.addrPrefix, _, err = bech32.Decode(authGen.Accounts[0].Address)
Expand Down Expand Up @@ -341,7 +341,7 @@ func (c *NodeRPC) UnconfirmedTxs(limit int) (*ctypes.ResultUnconfirmedTxs, error
if err != nil {
return nil, errors.Wrap(err, "unconfirmed_txs")
}
if len(result.Txs) <= 0 {
if len(result.Txs) == 0 {
result.Txs = make([]types.Tx, 0)
}
return result, nil
Expand All @@ -362,7 +362,7 @@ func (c *NodeRPC) NetInfo() (*ctypes.ResultNetInfo, error) {
if err != nil {
return nil, errors.Wrap(err, "NetInfo")
}
if len(result.Peers) <= 0 {
if len(result.Peers) == 0 {
result.Peers = make([]ctypes.Peer, 0)
}
return result, nil
Expand All @@ -374,7 +374,7 @@ func (c *NodeRPC) DumpConsensusState() (*ctypes.ResultDumpConsensusState, error)
if err != nil {
return nil, errors.Wrap(err, "DumpConsensusState")
}
if len(result.Peers) <= 0 {
if len(result.Peers) == 0 {
result.Peers = make([]ctypes.PeerStateInfo, 0)
}
return result, nil
Expand Down
4 changes: 1 addition & 3 deletions cmd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@ func preUpgradeCmd() *cobra.Command {
Use: "pre-upgrade",
Short: "Called by cosmovisor, before migrations upgrade",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
return updateConfig(cmd, args)
},
RunE: updateConfig,
}
return cmd
}
2 changes: 1 addition & 1 deletion cmd/doctor.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ func getBlockchain(cliCtx client.Context, serverCtx *sdkserver.Context) (blockch
if len(grpcAddr) > 0 {
return nil, err
}
if len(serverCtx.Config.RootDir) <= 0 {
if len(serverCtx.Config.RootDir) == 0 {
fmt.Printf("%sWarning: Not found root dir\n", SPACE)
return nil, nil
}
Expand Down
6 changes: 4 additions & 2 deletions cmd/fxcored/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package main

import (
"errors"
"os"

"github.com/cosmos/cosmos-sdk/server"
Expand All @@ -12,8 +13,9 @@ import (

func main() {
if err := svrcmd.Execute(cmd.NewRootCmd(), fxtypes.EnvPrefix, fxtypes.GetDefaultNodeHome()); err != nil {
switch e := err.(type) {
case server.ErrorCode:
var e server.ErrorCode
switch {
case errors.As(err, &e):
os.Exit(e.Code)
default:
os.Exit(1)
Expand Down
4 changes: 2 additions & 2 deletions cmd/testnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Example:
cmd.Println(fmt.Sprintf("Successfully initialized %d node directories", networkConfig.NumValidators))

dockerImage, _ := cmd.Flags().GetString(flagDockerImage)
if len(dockerImage) <= 0 {
if len(dockerImage) == 0 {
return nil
}
if err = generateDockerComposeYml(validators, outputDir, dockerImage); err != nil {
Expand Down Expand Up @@ -86,7 +86,7 @@ func generateDockerComposeYml(validators []*network.Validator, outputDir, docker
data := map[string]interface{}{
"Subnet": fmt.Sprintf("%s/16", getSubnet(IPAddress)),
}
var persistentPeers []string
persistentPeers := make([]string, 0, len(validators))
services := make([]map[string]interface{}, 0)
for i, validator := range validators {
ip, err := getNextIP(i, IPAddress)
Expand Down
2 changes: 1 addition & 1 deletion server/export_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func ExportSateCmd(appExporter types.AppExporter, defaultNodeHome string) *cobra

exported, err := appExporter(serverCtx.Logger, db, traceWriter, height, forZeroHeight, jailAllowedAddrs, serverCtx.Viper)
if err != nil {
return fmt.Errorf("error exporting state: %v", err)
return fmt.Errorf("error exporting state: %w", err)
}

doc, err := tmtypes.GenesisDocFromFile(serverCtx.Config.GenesisFile())
Expand Down
6 changes: 3 additions & 3 deletions server/grpc/auth/grpc_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func (Querier) ConvertAddress(_ context.Context, req *ConvertAddressRequest) (*C
if len(req.Address) == 0 {
return nil, status.Error(codes.InvalidArgument, "address cannot be empty")
}
if len(req.Prefix) <= 0 {
if len(req.Prefix) == 0 {
req.Prefix = fxtypes.AddressPrefix
}
address, err := ConvertBech32Prefix(req.Address, req.Prefix)
Expand All @@ -38,12 +38,12 @@ func (Querier) ConvertAddress(_ context.Context, req *ConvertAddressRequest) (*C
func ConvertBech32Prefix(address, prefix string) (string, error) {
_, bz, err := bech32.DecodeAndConvert(address)
if err != nil {
return "", fmt.Errorf("cannot decode %s address: %s", address, err)
return "", fmt.Errorf("cannot decode %s address: %w", address, err)
}

convertedAddress, err := bech32.ConvertAndEncode(prefix, bz)
if err != nil {
return "", fmt.Errorf("cannot convert %s address: %s", address, err)
return "", fmt.Errorf("cannot convert %s address: %w", address, err)
}
return convertedAddress, nil
}
Expand Down
Loading

0 comments on commit 3480789

Please sign in to comment.