Browse Source

linter: sort through each kind and address small fixes

pull/703/head
Zach Ramsay 7 years ago
committed by Ethan Buchman
parent
commit
bc2aa79f9a
5 changed files with 32 additions and 9 deletions
  1. +27
    -1
      Makefile
  2. +1
    -1
      benchmarks/map_test.go
  3. +1
    -1
      consensus/byzantine_test.go
  4. +2
    -5
      consensus/state.go
  5. +1
    -1
      node/id.go

+ 27
- 1
Makefile View File

@ -86,6 +86,32 @@ metalinter: ensure_tools
metalinter_test: ensure_tools
@gometalinter --install
gometalinter --vendor --deadline=600s --disable-all --enable=deadcode dupl ./...
gometalinter --vendor --deadline=600s --disable-all \
--enable=deadcode \
--enable=gas \
--enable=goimports \
--enable=gosimple \
--enable=gotype \
--enable=ineffassign \
--enable=misspell \
--enable=safesql \
--enable=structcheck \
--enable=varcheck \
./...
#--enable=aligncheck \
#--enable=dupl \
#--enable=errcheck \
#--enable=goconst \
#--enable=gocyclo \
#--enable=golint \ <== comments on anything exported
#--enable=interfacer \
#--enable=megacheck \
#--enable=staticcheck \
#--enable=unconvert \
#--enable=unparam \
#--enable=unused \
#--enable=vet \
#--enable=vetshadow \
.PHONY: install build build_race dist test test_race test_integrations test100 draw_deps list_deps get_deps get_vendor_deps update_deps revision tools

+ 1
- 1
benchmarks/map_test.go View File

@ -1,4 +1,4 @@
package benchmarks
package benchmarks // nolint (goimports)
import (
"testing"


+ 1
- 1
consensus/byzantine_test.go View File

@ -70,7 +70,7 @@ func TestByzantine(t *testing.T) {
conR.SetLogger(logger.With("validator", i))
conR.SetEventBus(eventBus)
var conRI p2p.Reactor
var conRI p2p.Reactor // nolint (gotype)
conRI = conR
if i == 0 {


+ 2
- 5
consensus/state.go View File

@ -371,7 +371,7 @@ func (cs *ConsensusState) updateRoundStep(round int, step cstypes.RoundStepType)
// enterNewRound(height, 0) at cs.StartTime.
func (cs *ConsensusState) scheduleRound0(rs *cstypes.RoundState) {
//cs.Logger.Info("scheduleRound0", "now", time.Now(), "startTime", cs.StartTime)
sleepDuration := rs.StartTime.Sub(time.Now())
sleepDuration := rs.StartTime.Sub(time.Now()) // nolint (gotype)
cs.scheduleTimeout(sleepDuration, rs.Height, 0, cstypes.RoundStepNewHeight)
}
@ -702,10 +702,7 @@ func (cs *ConsensusState) needProofBlock(height int) bool {
}
lastBlockMeta := cs.blockStore.LoadBlockMeta(height - 1)
if !bytes.Equal(cs.state.AppHash, lastBlockMeta.Header.AppHash) {
return true
}
return false
return !bytes.Equal(cs.state.AppHash, lastBlockMeta.Header.AppHash)
}
func (cs *ConsensusState) proposalHeartbeat(height, round int) {


+ 1
- 1
node/id.go View File

@ -1,4 +1,4 @@
package node
package node // nolint (goimports)
import (
"time"


Loading…
Cancel
Save