various linter fixes (#6106)

x/staking: Fix all linter warnings.

Fixed warnings across base packages.

New linters:
- unparam
- nolintlint

Co-authored-by: Alessio Treglia <alessio@tendermint.com>
This commit is contained in:
Marko
2020-05-02 21:26:59 +02:00
committed by GitHub
co-authored by Alessio Treglia
parent 9251812f69
commit 218ec99508
103 changed files with 636 additions and 278 deletions
+3
View File
@@ -50,7 +50,9 @@ var configTemplate *template.Template
func init() {
var err error
tmpl := template.New("appConfigFileTemplate")
if configTemplate, err = tmpl.Parse(defaultConfigTemplate); err != nil {
panic(err)
}
@@ -61,6 +63,7 @@ func init() {
func ParseConfig() (*Config, error) {
conf := DefaultConfig()
err := viper.Unmarshal(conf)
return conf, err
}
+9 -9
View File
@@ -72,7 +72,7 @@ which accepts a path for the resulting pprof file.
ctx.Logger.Info("starting ABCI with Tendermint")
_, err := startInProcess(ctx, appCreator)
err := startInProcess(ctx, appCreator)
return err
},
}
@@ -143,26 +143,26 @@ func startStandAlone(ctx *Context, appCreator AppCreator) error {
select {}
}
func startInProcess(ctx *Context, appCreator AppCreator) (*node.Node, error) {
func startInProcess(ctx *Context, appCreator AppCreator) error {
cfg := ctx.Config
home := cfg.RootDir
traceWriterFile := viper.GetString(flagTraceStore)
db, err := openDB(home)
if err != nil {
return nil, err
return err
}
traceWriter, err := openTraceWriter(traceWriterFile)
if err != nil {
return nil, err
return err
}
app := appCreator(ctx.Logger, db, traceWriter)
nodeKey, err := p2p.LoadOrGenNodeKey(cfg.NodeKeyFile())
if err != nil {
return nil, err
return err
}
// create & start tendermint node
@@ -177,11 +177,11 @@ func startInProcess(ctx *Context, appCreator AppCreator) (*node.Node, error) {
ctx.Logger.With("module", "node"),
)
if err != nil {
return nil, err
return err
}
if err := tmNode.Start(); err != nil {
return nil, err
return err
}
var cpuProfileCleanup func()
@@ -189,12 +189,12 @@ func startInProcess(ctx *Context, appCreator AppCreator) (*node.Node, error) {
if cpuProfile := viper.GetString(flagCPUProfile); cpuProfile != "" {
f, err := os.Create(cpuProfile)
if err != nil {
return nil, err
return err
}
ctx.Logger.Info("starting CPU profiler", "profile", cpuProfile)
if err := pprof.StartCPUProfile(f); err != nil {
return nil, err
return err
}
cpuProfileCleanup = func() {
+14
View File
@@ -53,21 +53,26 @@ func PersistentPreRunEFn(context *Context) func(*cobra.Command, []string) error
if cmd.Name() == version.Cmd.Name() {
return nil
}
config, err := interceptLoadConfig()
if err != nil {
return err
}
logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
logger, err = tmflags.ParseLogLevel(config.LogLevel, logger, cfg.DefaultLogLevel())
if err != nil {
return err
}
if viper.GetBool(cli.TraceFlag) {
logger = log.NewTracingLogger(logger)
}
logger = logger.With("module", "main")
context.Config = config
context.Logger = logger
return nil
}
}
@@ -173,6 +178,7 @@ func ExternalIP() (string, error) {
if err != nil {
return "", err
}
for _, iface := range ifaces {
if skipInterface(iface) {
continue
@@ -181,6 +187,7 @@ func ExternalIP() (string, error) {
if err != nil {
return "", err
}
for _, addr := range addrs {
ip := addrToIP(addr)
if ip == nil || ip.IsLoopback() {
@@ -200,18 +207,22 @@ func ExternalIP() (string, error) {
func TrapSignal(cleanupFunc func()) {
sigs := make(chan os.Signal, 1)
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
go func() {
sig := <-sigs
if cleanupFunc != nil {
cleanupFunc()
}
exitCode := 128
switch sig {
case syscall.SIGINT:
exitCode += int(syscall.SIGINT)
case syscall.SIGTERM:
exitCode += int(syscall.SIGTERM)
}
os.Exit(exitCode)
}()
}
@@ -220,14 +231,17 @@ func skipInterface(iface net.Interface) bool {
if iface.Flags&net.FlagUp == 0 {
return true // interface down
}
if iface.Flags&net.FlagLoopback != 0 {
return true // loopback interface
}
return false
}
func addrToIP(addr net.Addr) net.IP {
var ip net.IP
switch v := addr.(type) {
case *net.IPNet:
ip = v.IP