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

Makefile: add megacheck & some additional fixes

This commit is contained in:
zramsay 2017-05-30 13:27:31 -04:00
parent bf5181d9ca
commit 9c3eee0b00
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -1,6 +1,8 @@
GOTOOLS = \ GOTOOLS = \
github.com/mitchellh/gox \ github.com/mitchellh/gox \
github.com/Masterminds/glide github.com/Masterminds/glide \
honnef.co/go/tools/cmd/megacheck
PACKAGES=$(shell go list ./... | grep -v '/vendor/') PACKAGES=$(shell go list ./... | grep -v '/vendor/')
BUILD_TAGS?=tendermint BUILD_TAGS?=tendermint
TMHOME = $${TMHOME:-$$HOME/.tendermint} TMHOME = $${TMHOME:-$$HOME/.tendermint}
@ -72,5 +74,10 @@ tools:
ensure_tools: ensure_tools:
go get $(GOTOOLS) go get $(GOTOOLS)
### Formatting, linting, and vetting
megacheck:
@for pkg in ${PACKAGES}; do megacheck "$$pkg"; done
.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 .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

5
cmd/tendermint/commands/root.go
View File

@ -31,9 +31,6 @@ var RootCmd = &cobra.Command{
config.SetRoot(config.RootDir) config.SetRoot(config.RootDir)
cfg.EnsureRoot(config.RootDir) cfg.EnsureRoot(config.RootDir)
logger, err = tmflags.ParseLogLevel(config.LogLevel, logger) logger, err = tmflags.ParseLogLevel(config.LogLevel, logger)
if err != nil { return err
return err
}
return nil
}, },
} }

5
consensus/byzantine_test.go
View File

@ -117,10 +117,7 @@ func TestByzantine(t *testing.T) {
p2p.Connect2Switches(switches, ind1, ind2) p2p.Connect2Switches(switches, ind1, ind2)
// wait for someone in the big partition to make a block // wait for someone in the big partition to make a block
<-eventChans[ind2]
select {
case <-eventChans[ind2]:
}
t.Log("A block has been committed. Healing partition") t.Log("A block has been committed. Healing partition")