fix vet ineffassign problem in tendermint and valnode

plugin/consensus/tendermint/consensus_state.go

@@ -1180,7 +1180,7 @@ func (cs *ConsensusState) defaultSetProposal(proposal *tmtypes.Proposal) error {
 // NOTE: block is not necessarily valid.
 // Asynchronously triggers either enterPrevote (before we timeout of propose) or tryFinalizeCommit, once we have the full block.
 func (cs *ConsensusState) addProposalBlock(proposalBlock *tmtypes.TendermintBlock) (err error) {
-	block := &ttypes.TendermintBlock{proposalBlock}
+	block := &ttypes.TendermintBlock{TendermintBlock: proposalBlock}
 	height, round := block.Header.Height, block.Header.Round
 	tendermintlog.Debug(fmt.Sprintf("Consensus receive proposal block. Current: %v/%v/%v", cs.Height, cs.Round, cs.Step),
 		"block(H/R/hash)", fmt.Sprintf("%v/%v/%X", height, round, block.Hash()))

plugin/consensus/tendermint/peer_set.go

@@ -283,28 +283,39 @@ func (pc *peerConn) HandshakeTimeout(
 		func() {
 			info, err1 := json.Marshal(ourNodeInfo)
 			if err1 != nil {
-				tendermintlog.Error("Peer handshake peerNodeInfo failed", "err", err1)
+				tendermintlog.Error("Peer handshake Marshal ourNodeInfo failed", "err", err1)
 				return
 			}
 			frame := make([]byte, 4)
 			binary.BigEndian.PutUint32(frame, uint32(len(info)))
 			_, err1 = pc.conn.Write(frame)
+			if err1 != nil {
+				tendermintlog.Error("Peer handshake write info size failed", "err", err1)
+				return
+			}
 			_, err1 = pc.conn.Write(info[:])
+			if err1 != nil {
+				tendermintlog.Error("Peer handshake write info failed", "err", err1)
+				return
+			}
 		},
 		func() {
 			readBuffer := make([]byte, 4)
 			_, err2 = io.ReadFull(pc.conn, readBuffer[:])
 			if err2 != nil {
+				tendermintlog.Error("Peer handshake read info size failed", "err", err1)
 				return
 			}
 			len := binary.BigEndian.Uint32(readBuffer)
 			readBuffer = make([]byte, len)
 			_, err2 = io.ReadFull(pc.conn, readBuffer[:])
 			if err2 != nil {
+				tendermintlog.Error("Peer handshake read info failed", "err", err1)
 				return
 			}
 			err2 = json.Unmarshal(readBuffer, &peerNodeInfo)
 			if err2 != nil {
+				tendermintlog.Error("Peer handshake Unmarshal failed", "err", err1)
 				return
 			}
 			tendermintlog.Info("Peer handshake", "peerNodeInfo", peerNodeInfo)

plugin/consensus/tendermint/tendermint.go

@@ -458,7 +458,7 @@ func (client *Client) CommitBlock(propBlock *types.Block) error {
 // CheckCommit by height
 func (client *Client) CheckCommit(height int64) bool {
 	retry := 0
-	newHeight := int64(1)
+	var newHeight int64
 	for {
 		newHeight = client.GetCurrentHeight()
 		if newHeight >= height {