certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge PR #2401: Remove remnants of gocyclo

This commit is contained in:
Alexander Bezobchuk 2018-09-25 17:45:04 +00:00 committed by Rigel
parent c31c0d2822
commit 611e287375
17 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/keys/add.go
View File

@ -46,7 +46,6 @@ phrase, otherwise, a new key will be generated.`,
return cmd return cmd
} }
// nolint: gocyclo
// TODO remove the above when addressing #1446 // TODO remove the above when addressing #1446
func runAddCmd(cmd *cobra.Command, args []string) error { func runAddCmd(cmd *cobra.Command, args []string) error {
var kb keys.Keybase var kb keys.Keybase

15
tools/Makefile
View File

@ -12,7 +12,6 @@ INEFFASSIGN = github.com/gordonklaus/ineffassign
MISSPELL = github.com/client9/misspell/cmd/misspell MISSPELL = github.com/client9/misspell/cmd/misspell
ERRCHECK = github.com/kisielk/errcheck ERRCHECK = github.com/kisielk/errcheck
UNPARAM = mvdan.cc/unparam UNPARAM = mvdan.cc/unparam
GOCYCLO = github.com/alecthomas/gocyclo
DEP_CHECK := $(shell command -v dep 2> /dev/null) DEP_CHECK := $(shell command -v dep 2> /dev/null)
GOLINT_CHECK := $(shell command -v golint 2> /dev/null) GOLINT_CHECK := $(shell command -v golint 2> /dev/null)
@ -22,7 +21,6 @@ INEFFASSIGN_CHECK := $(shell command -v ineffassign 2> /dev/null)
MISSPELL_CHECK := $(shell command -v misspell 2> /dev/null) MISSPELL_CHECK := $(shell command -v misspell 2> /dev/null)
ERRCHECK_CHECK := $(shell command -v errcheck 2> /dev/null) ERRCHECK_CHECK := $(shell command -v errcheck 2> /dev/null)
UNPARAM_CHECK := $(shell command -v unparam 2> /dev/null) UNPARAM_CHECK := $(shell command -v unparam 2> /dev/null)
# GOCYCLO_CHECK := $(shell command -v gocyclo 2> /dev/null)
check_tools: check_tools:
ifndef DEP_CHECK ifndef DEP_CHECK
@ -68,11 +66,6 @@ ifndef UNPARAM_CHECK
else else
@echo "Found unparam in path." @echo "Found unparam in path."
endif endif
ifndef GOCYCLO_CHECK
@echo "No gocyclo in path. Install with 'make get_tools'."
else
@echo "Found gocyclo in path."
endif
get_tools: get_tools:
ifdef DEP_CHECK ifdef DEP_CHECK
@ -126,12 +119,6 @@ else
@echo "Installing unparam" @echo "Installing unparam"
go get -v $(UNPARAM) go get -v $(UNPARAM)
endif endif
# ifdef GOCYCLO_CHECK
# @echo "gocyclo is already installed. Run 'make update_tools' to update."
# else
# @echo "Installing gocyclo"
# go get -v $(GOCYCLO)
# endif
update_tools: update_tools:
@echo "Updating dep" @echo "Updating dep"
@ -153,8 +140,6 @@ update_dev_tools:
go get -u -v $(ERRCHECK) go get -u -v $(ERRCHECK)
@echo "Updating unparam" @echo "Updating unparam"
go get -u -v $(UNPARAM) go get -u -v $(UNPARAM)
# @echo "Updating goyclo"
# go get -u -v $(GOCYCLO)
# To avoid unintended conflicts with file names, always add to .PHONY # To avoid unintended conflicts with file names, always add to .PHONY
# unless there is a reason not to. # unless there is a reason not to.

1
types/errors.go
View File

@ -73,7 +73,6 @@ func unknownCodeMsg(code CodeType) string {
} }
// NOTE: Don't stringer this, we'll put better messages in later. // NOTE: Don't stringer this, we'll put better messages in later.
// nolint: gocyclo
func CodeToDefaultMsg(code CodeType) string { func CodeToDefaultMsg(code CodeType) string {
switch code { switch code {
case CodeInternal: case CodeInternal:

1
x/auth/ante.go
View File

@ -23,7 +23,6 @@ const (
// NewAnteHandler returns an AnteHandler that checks // NewAnteHandler returns an AnteHandler that checks
// and increments sequence numbers, checks signatures & account numbers, // and increments sequence numbers, checks signatures & account numbers,
// and deducts fees from the first signer. // and deducts fees from the first signer.
// nolint: gocyclo
func NewAnteHandler(am AccountMapper, fck FeeCollectionKeeper) sdk.AnteHandler { func NewAnteHandler(am AccountMapper, fck FeeCollectionKeeper) sdk.AnteHandler {
return func( return func(

1
x/bank/client/rest/sendtx.go
View File

@ -43,7 +43,6 @@ func init() {
} }
// SendRequestHandlerFn - http request handler to send coins to a address // SendRequestHandlerFn - http request handler to send coins to a address
// nolint: gocyclo
func SendRequestHandlerFn(cdc *codec.Codec, kb keys.Keybase, cliCtx context.CLIContext) http.HandlerFunc { func SendRequestHandlerFn(cdc *codec.Codec, kb keys.Keybase, cliCtx context.CLIContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
// collect data // collect data

1
x/gov/client/cli/tx.go
View File

@ -285,7 +285,6 @@ func GetCmdQueryProposal(queryRoute string, cdc *codec.Codec) *cobra.Command {
return cmd return cmd
} }
// nolint: gocyclo
// GetCmdQueryProposals implements a query proposals command. // GetCmdQueryProposals implements a query proposals command.
func GetCmdQueryProposals(queryRoute string, cdc *codec.Codec) *cobra.Command { func GetCmdQueryProposals(queryRoute string, cdc *codec.Codec) *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{

3
x/gov/client/rest/rest.go
View File

@ -334,7 +334,6 @@ func queryVoteHandlerFn(cdc *codec.Codec) http.HandlerFunc {
} }
} }
// nolint: gocyclo
// todo: Split this functionality into helper functions to remove the above // todo: Split this functionality into helper functions to remove the above
func queryVotesOnProposalHandlerFn(cdc *codec.Codec) http.HandlerFunc { func queryVotesOnProposalHandlerFn(cdc *codec.Codec) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
@ -373,7 +372,6 @@ func queryVotesOnProposalHandlerFn(cdc *codec.Codec) http.HandlerFunc {
} }
} }
// nolint: gocyclo
// todo: Split this functionality into helper functions to remove the above // todo: Split this functionality into helper functions to remove the above
func queryProposalsWithParameterFn(cdc *codec.Codec) http.HandlerFunc { func queryProposalsWithParameterFn(cdc *codec.Codec) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
@ -439,7 +437,6 @@ func queryProposalsWithParameterFn(cdc *codec.Codec) http.HandlerFunc {
} }
} }
// nolint: gocyclo
// todo: Split this functionality into helper functions to remove the above // todo: Split this functionality into helper functions to remove the above
func queryTallyOnProposalHandlerFn(cdc *codec.Codec) http.HandlerFunc { func queryTallyOnProposalHandlerFn(cdc *codec.Codec) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {

1
x/gov/keeper.go
View File

@ -106,7 +106,6 @@ func (keeper Keeper) DeleteProposal(ctx sdk.Context, proposal Proposal) {
store.Delete(KeyProposal(proposal.GetProposalID())) store.Delete(KeyProposal(proposal.GetProposalID()))
} }
// nolint: gocyclo
// Get Proposal from store by ProposalID // Get Proposal from store by ProposalID
func (keeper Keeper) GetProposalsFiltered(ctx sdk.Context, voterAddr sdk.AccAddress, depositerAddr sdk.AccAddress, status ProposalStatus, numLatest int64) []Proposal { func (keeper Keeper) GetProposalsFiltered(ctx sdk.Context, voterAddr sdk.AccAddress, depositerAddr sdk.AccAddress, status ProposalStatus, numLatest int64) []Proposal {

1
x/ibc/client/cli/relay.go
View File

@ -91,7 +91,6 @@ func (c relayCommander) runIBCRelay(cmd *cobra.Command, args []string) {
} }
// This is nolinted as someone is in the process of refactoring this to remove the goto // This is nolinted as someone is in the process of refactoring this to remove the goto
// nolint: gocyclo
func (c relayCommander) loop(fromChainID, fromChainNode, toChainID, toChainNode string) { func (c relayCommander) loop(fromChainID, fromChainNode, toChainID, toChainNode string) {
cliCtx := context.NewCLIContext() cliCtx := context.NewCLIContext()

1
x/ibc/client/rest/transfer.go
View File

@ -35,7 +35,6 @@ type transferBody struct {
// TransferRequestHandler - http request handler to transfer coins to a address // TransferRequestHandler - http request handler to transfer coins to a address
// on a different chain via IBC // on a different chain via IBC
// nolint: gocyclo
func TransferRequestHandlerFn(cdc *codec.Codec, kb keys.Keybase, cliCtx context.CLIContext) http.HandlerFunc { func TransferRequestHandlerFn(cdc *codec.Codec, kb keys.Keybase, cliCtx context.CLIContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r) vars := mux.Vars(r)

1
x/slashing/client/rest/tx.go
View File

@ -38,7 +38,6 @@ type UnjailBody struct {
ValidatorAddr string `json:"validator_addr"` ValidatorAddr string `json:"validator_addr"`
} }
// nolint: gocyclo
func unjailRequestHandlerFn(cdc *codec.Codec, kb keys.Keybase, cliCtx context.CLIContext) http.HandlerFunc { func unjailRequestHandlerFn(cdc *codec.Codec, kb keys.Keybase, cliCtx context.CLIContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
var m UnjailBody var m UnjailBody

1
x/slashing/keeper.go
View File

@ -79,7 +79,6 @@ func (k Keeper) handleDoubleSign(ctx sdk.Context, addr crypto.Address, infractio
// handle a validator signature, must be called once per validator per block // handle a validator signature, must be called once per validator per block
// TODO refactor to take in a consensus address, additionally should maybe just take in the pubkey too // TODO refactor to take in a consensus address, additionally should maybe just take in the pubkey too
// nolint gocyclo
func (k Keeper) handleValidatorSignature(ctx sdk.Context, addr crypto.Address, power int64, signed bool) { func (k Keeper) handleValidatorSignature(ctx sdk.Context, addr crypto.Address, power int64, signed bool) {
logger := ctx.Logger().With("module", "x/slashing") logger := ctx.Logger().With("module", "x/slashing")
height := ctx.BlockHeight() height := ctx.BlockHeight()

1
x/stake/client/rest/query.go
View File

@ -120,7 +120,6 @@ func delegatorHandlerFn(cliCtx context.CLIContext, cdc *codec.Codec) http.Handle
} }
} }
// nolint gocyclo
// HTTP request handler to query all staking txs (msgs) from a delegator // HTTP request handler to query all staking txs (msgs) from a delegator
func delegatorTxsHandlerFn(cliCtx context.CLIContext, cdc *codec.Codec) http.HandlerFunc { func delegatorTxsHandlerFn(cliCtx context.CLIContext, cdc *codec.Codec) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {

1
x/stake/client/rest/tx.go
View File

@ -69,7 +69,6 @@ type EditDelegationsBody struct {
CompleteRedelegates []msgCompleteRedelegateInput `json:"complete_redelegates"` CompleteRedelegates []msgCompleteRedelegateInput `json:"complete_redelegates"`
} }
// nolint: gocyclo
// TODO: Split this up into several smaller functions, and remove the above nolint // TODO: Split this up into several smaller functions, and remove the above nolint
// TODO: use sdk.ValAddress instead of sdk.AccAddress for validators in messages // TODO: use sdk.ValAddress instead of sdk.AccAddress for validators in messages
func delegationsRequestHandlerFn(cdc *codec.Codec, kb keys.Keybase, cliCtx context.CLIContext) http.HandlerFunc { func delegationsRequestHandlerFn(cdc *codec.Codec, kb keys.Keybase, cliCtx context.CLIContext) http.HandlerFunc {

2
x/stake/keeper/slash.go
View File

@ -21,8 +21,6 @@ import (
// CONTRACT: // CONTRACT:
// Infraction committed at the current height or at a past height, // Infraction committed at the current height or at a past height,
// not at a height in the future // not at a height in the future
//
// nolint: gocyclo
func (k Keeper) Slash(ctx sdk.Context, consAddr sdk.ConsAddress, infractionHeight int64, power int64, slashFactor sdk.Dec) { func (k Keeper) Slash(ctx sdk.Context, consAddr sdk.ConsAddress, infractionHeight int64, power int64, slashFactor sdk.Dec) {
logger := ctx.Logger().With("module", "x/stake") logger := ctx.Logger().With("module", "x/stake")

4
x/stake/keeper/validator.go
View File

@ -232,7 +232,6 @@ func (k Keeper) GetValidTendermintUpdates(ctx sdk.Context) (updates []abci.Valid
// It may kick out validators if a new validator is entering the bonded validator // It may kick out validators if a new validator is entering the bonded validator
// group. // group.
// //
// nolint: gocyclo
// TODO: Remove above nolint, function needs to be simplified! // TODO: Remove above nolint, function needs to be simplified!
func (k Keeper) UpdateValidator(ctx sdk.Context, validator types.Validator) types.Validator { func (k Keeper) UpdateValidator(ctx sdk.Context, validator types.Validator) types.Validator {
tstore := ctx.TransientStore(k.storeTKey) tstore := ctx.TransientStore(k.storeTKey)
@ -422,9 +421,6 @@ func (k Keeper) updateValidatorPower(ctx sdk.Context, oldFound bool, oldValidato
// updated in store with the ValidatorsBondedIndexKey. This store is used to // updated in store with the ValidatorsBondedIndexKey. This store is used to
// determine if a validator is a validator without needing to iterate over all // determine if a validator is a validator without needing to iterate over all
// validators. // validators.
//
// nolint: gocyclo
// TODO: Remove the above golint
func (k Keeper) UpdateBondedValidators( func (k Keeper) UpdateBondedValidators(
ctx sdk.Context, affectedValidator types.Validator) ( ctx sdk.Context, affectedValidator types.Validator) (
updatedVal types.Validator, updated bool) { updatedVal types.Validator, updated bool) {

1
x/stake/types/inflation_test.go
View File

@ -107,7 +107,6 @@ func updateProvisions(t *testing.T, pool Pool, params Params, hr int) (sdk.Dec,
} }
// Checks that The inflation will correctly increase or decrease after an update to the pool // Checks that The inflation will correctly increase or decrease after an update to the pool
// nolint: gocyclo
func checkInflation(t *testing.T, pool Pool, previousInflation, updatedInflation sdk.Dec, msg string) { func checkInflation(t *testing.T, pool Pool, previousInflation, updatedInflation sdk.Dec, msg string) {
inflationChange := updatedInflation.Sub(previousInflation) inflationChange := updatedInflation.Sub(previousInflation)