From 9257f7f79efe80a2eeb698f4f036c92829382b33 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Thu, 7 Mar 2019 00:19:07 +0400 Subject: [PATCH] make ineffassign linter pass Refs #3262 --- .golangci.yml | 1 - consensus/state.go | 12 ++++++++---- lite/dbprovider.go | 4 ++-- lite/dynamic_verifier_test.go | 1 + lite/proxy/query_test.go | 1 + p2p/conn/connection_test.go | 5 ++++- rpc/core/status.go | 2 +- state/execution_test.go | 3 ++- 8 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 45cabe20..b313fb21 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -10,7 +10,6 @@ linters: - errcheck - staticcheck - dupl - - ineffassign - interfacer - unconvert - goconst diff --git a/consensus/state.go b/consensus/state.go index cf32afe7..88741aec 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -670,7 +670,10 @@ func (cs *ConsensusState) handleMsg(mi msgInfo) { cs.mtx.Lock() defer cs.mtx.Unlock() - var err error + var ( + err error + added bool + ) msg, peerID := mi.Msg, mi.PeerID switch msg := msg.(type) { case *ProposalMessage: @@ -679,7 +682,7 @@ func (cs *ConsensusState) handleMsg(mi msgInfo) { err = cs.setProposal(msg.Proposal) case *BlockPartMessage: // if the proposal is complete, we'll enterPrevote or tryFinalizeCommit - added, err := cs.addProposalBlockPart(msg, peerID) + added, err = cs.addProposalBlockPart(msg, peerID) if added { cs.statsMsgQueue <- mi } @@ -691,7 +694,7 @@ func (cs *ConsensusState) handleMsg(mi msgInfo) { case *VoteMessage: // attempt to add the vote and dupeout the validator if its a duplicate signature // if the vote gives us a 2/3-any or 2/3-one, we transition - added, err := cs.tryAddVote(msg.Vote, peerID) + added, err = cs.tryAddVote(msg.Vote, peerID) if added { cs.statsMsgQueue <- mi } @@ -714,7 +717,8 @@ func (cs *ConsensusState) handleMsg(mi msgInfo) { cs.Logger.Error("Unknown msg type", reflect.TypeOf(msg)) } if err != nil { - cs.Logger.Error("Error with msg", "height", cs.Height, "round", cs.Round, "type", reflect.TypeOf(msg), "peer", peerID, "err", err, "msg", msg) + cs.Logger.Error("Error with msg", "height", cs.Height, "round", cs.Round, + "type", reflect.TypeOf(msg), "peer", peerID, "err", err, "msg", msg) } } diff --git a/lite/dbprovider.go b/lite/dbprovider.go index ef1b2a59..df9cc199 100644 --- a/lite/dbprovider.go +++ b/lite/dbprovider.go @@ -258,7 +258,7 @@ func parseKey(key []byte) (chainID string, height int64, part string, ok bool) { } func parseSignedHeaderKey(key []byte) (chainID string, height int64, ok bool) { - chainID, height, part, ok := parseKey(key) + chainID, height, part, _ := parseKey(key) if part != "sh" { return "", 0, false } @@ -266,6 +266,6 @@ func parseSignedHeaderKey(key []byte) (chainID string, height int64, ok bool) { } func parseChainKeyPrefix(key []byte) (chainID string, height int64, ok bool) { - chainID, height, _, ok = parseKey(key) + chainID, height, _, _ = parseKey(key) return chainID, height, true } diff --git a/lite/dynamic_verifier_test.go b/lite/dynamic_verifier_test.go index 386de513..e85cb7de 100644 --- a/lite/dynamic_verifier_test.go +++ b/lite/dynamic_verifier_test.go @@ -255,6 +255,7 @@ func TestConcurrencyInquirerVerify(t *testing.T) { cert.SetLogger(log.TestingLogger()) err = source.SaveFullCommit(fcz[7]) + require.Nil(err, "%+v", err) err = source.SaveFullCommit(fcz[8]) require.Nil(err, "%+v", err) sh := fcz[8].SignedHeader diff --git a/lite/proxy/query_test.go b/lite/proxy/query_test.go index c1450a5e..c090de16 100644 --- a/lite/proxy/query_test.go +++ b/lite/proxy/query_test.go @@ -93,6 +93,7 @@ func _TestAppProofs(t *testing.T) { // verify a query before the tx block has no data (and valid non-exist proof) bs, height, proof, err := GetWithProof(prt, k, brh-1, cl, cert) require.NoError(err, "%#v", err) + require.Equal(height, brh-1) // require.NotNil(proof) // TODO: Ensure that *some* keys will be there, ensuring that proof is nil, // (currently there's a race condition) diff --git a/p2p/conn/connection_test.go b/p2p/conn/connection_test.go index afad69d1..02018cc1 100644 --- a/p2p/conn/connection_test.go +++ b/p2p/conn/connection_test.go @@ -223,7 +223,10 @@ func TestMConnectionMultiplePongsInTheBeginning(t *testing.T) { serverGotPing := make(chan struct{}) go func() { // read ping (one byte) - var packet, err = Packet(nil), error(nil) + var ( + packet Packet + err error + ) _, err = cdc.UnmarshalBinaryLengthPrefixedReader(server, &packet, maxPingPongPacketSize) require.Nil(t, err) serverGotPing <- struct{}{} diff --git a/rpc/core/status.go b/rpc/core/status.go index 224857d0..ae22ecd3 100644 --- a/rpc/core/status.go +++ b/rpc/core/status.go @@ -71,7 +71,7 @@ import ( // } // ``` func Status() (*ctypes.ResultStatus, error) { - var latestHeight int64 = -1 + var latestHeight int64 if consensusReactor.FastSync() { latestHeight = blockStore.Height() } else { diff --git a/state/execution_test.go b/state/execution_test.go index 94336851..4e7b44d7 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -43,7 +43,8 @@ func TestApplyBlock(t *testing.T) { block := makeBlock(state, 1) blockID := types.BlockID{block.Hash(), block.MakePartSet(testPartSize).Header()} - state, err = blockExec.ApplyBlock(state, blockID, block) + //nolint:ineffassign + state, err = blockExec.ApplyBlock(state, blockID, block) require.Nil(t, err) // TODO check state and mempool