From e561129f43ef159e9028a809efb3c3b8685f03eb Mon Sep 17 00:00:00 2001 From: William Banfield Date: Wed, 26 Oct 2022 18:19:18 -0400 Subject: [PATCH] lint fixes --- blocksync/reactor.go | 2 +- cmd/tendermint/commands/debug/util.go | 3 ++- cmd/tendermint/commands/rollback.go | 2 +- consensus/msgs.go | 3 +++ libs/rand/random.go | 2 +- mempool/v0/reactor_test.go | 3 +-- p2p/switch_test.go | 11 +++++------ 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/blocksync/reactor.go b/blocksync/reactor.go index ff435981e..87dae8170 100644 --- a/blocksync/reactor.go +++ b/blocksync/reactor.go @@ -283,7 +283,7 @@ func (bcR *Reactor) poolRoutine(stateSynced bool) { case <-statusUpdateTicker.C: // ask for status updates - go bcR.BroadcastStatusRequest() //nolint: errcheck + go bcR.BroadcastStatusRequest() } } diff --git a/cmd/tendermint/commands/debug/util.go b/cmd/tendermint/commands/debug/util.go index 089817f2f..accf65413 100644 --- a/cmd/tendermint/commands/debug/util.go +++ b/cmd/tendermint/commands/debug/util.go @@ -67,7 +67,8 @@ func copyConfig(home, dir string) error { func dumpProfile(dir, addr, profile string, debug int) error { endpoint := fmt.Sprintf("%s/debug/pprof/%s?debug=%d", addr, profile, debug) - resp, err := http.Get(endpoint) //nolint: gosec + //nolint: gosec + resp, err := http.Get(endpoint) if err != nil { return fmt.Errorf("failed to query for %s profile: %w", profile, err) } diff --git a/cmd/tendermint/commands/rollback.go b/cmd/tendermint/commands/rollback.go index d9458d676..c232c0b8d 100644 --- a/cmd/tendermint/commands/rollback.go +++ b/cmd/tendermint/commands/rollback.go @@ -14,7 +14,7 @@ import ( "github.com/tendermint/tendermint/store" ) -var removeBlock bool = false +var removeBlock = false func init() { RollbackStateCmd.Flags().BoolVar(&removeBlock, "hard", false, "remove last block as well as state") diff --git a/consensus/msgs.go b/consensus/msgs.go index f64037b6a..6eb339aae 100644 --- a/consensus/msgs.go +++ b/consensus/msgs.go @@ -307,6 +307,9 @@ func WALFromProto(msg *tmcons.WALMessage) (WALMessage, error) { } case *tmcons.WALMessage_MsgInfo: um, err := msg.MsgInfo.Msg.Unwrap() + if err != nil { + return nil, fmt.Errorf("unwrap message: %w", err) + } walMsg, err := MsgFromProto(um) if err != nil { return nil, fmt.Errorf("msgInfo from proto error: %w", err) diff --git a/libs/rand/random.go b/libs/rand/random.go index 05af30f1a..7d2410ee9 100644 --- a/libs/rand/random.go +++ b/libs/rand/random.go @@ -48,7 +48,7 @@ func (r *Rand) init() { } func (r *Rand) reset(seed int64) { - r.rand = mrand.New(mrand.NewSource(seed)) //nolint:gosec + r.rand = mrand.New(mrand.NewSource(seed)) } //---------------------------------------- diff --git a/mempool/v0/reactor_test.go b/mempool/v0/reactor_test.go index 0719b4166..cf6f847d6 100644 --- a/mempool/v0/reactor_test.go +++ b/mempool/v0/reactor_test.go @@ -22,7 +22,6 @@ import ( "github.com/tendermint/tendermint/p2p" "github.com/tendermint/tendermint/p2p/mock" memproto "github.com/tendermint/tendermint/proto/tendermint/mempool" - protomem "github.com/tendermint/tendermint/proto/tendermint/mempool" "github.com/tendermint/tendermint/proxy" "github.com/tendermint/tendermint/types" ) @@ -283,7 +282,7 @@ func TestDontExhaustMaxActiveIDs(t *testing.T) { reactor.Receive(p2p.Envelope{ ChannelID: mempool.MempoolChannel, Src: peer, - Message: &protomem.Txs{ + Message: &memproto.Txs{ Txs: [][]byte{{0x01, 0x02, 0x03}}, }}) reactor.AddPeer(peer) diff --git a/p2p/switch_test.go b/p2p/switch_test.go index ce63288af..4a75033f1 100644 --- a/p2p/switch_test.go +++ b/p2p/switch_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "github.com/golang/protobuf/proto" + "github.com/cosmos/gogoproto/proto" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -24,7 +24,6 @@ import ( "github.com/tendermint/tendermint/libs/log" tmsync "github.com/tendermint/tendermint/libs/sync" "github.com/tendermint/tendermint/p2p/conn" - "github.com/tendermint/tendermint/proto/tendermint/p2p" p2pproto "github.com/tendermint/tendermint/proto/tendermint/p2p" ) @@ -138,21 +137,21 @@ func TestSwitches(t *testing.T) { // Lets send some messages ch0Msg := &p2pproto.PexAddrs{ - Addrs: []p2p.NetAddress{ + Addrs: []p2pproto.NetAddress{ { ID: "1", }, }, } ch1Msg := &p2pproto.PexAddrs{ - Addrs: []p2p.NetAddress{ + Addrs: []p2pproto.NetAddress{ { ID: "1", }, }, } ch2Msg := &p2pproto.PexAddrs{ - Addrs: []p2p.NetAddress{ + Addrs: []p2pproto.NetAddress{ { ID: "2", }, @@ -453,7 +452,7 @@ func TestSwitchStopPeerForError(t *testing.T) { p := sw1.Peers().List()[0] p.Send(Envelope{ ChannelID: 0x1, - Message: &p2p.Message{}, + Message: &p2pproto.Message{}, }) // stop sw2. this should cause the p to fail,