Commit f3dce13b authored by caopingcp's avatar caopingcp

fix linter issue

parent 828bdb6f
......@@ -42,8 +42,6 @@ const (
minReadBufferSize = 1024
minWriteBufferSize = 65536
broadcastEvidenceIntervalS = 60 // broadcast uncommitted evidence this often
)
// Parallel method
......
......@@ -3,11 +3,11 @@ package tendermint
import (
"encoding/hex"
"fmt"
"github.com/33cn/chain33/types"
"sync"
"testing"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/types"
"github.com/stretchr/testify/assert"
)
......
......@@ -6,6 +6,7 @@ import (
dbm "github.com/33cn/chain33/common/db"
"github.com/33cn/chain33/types"
tmtypes "github.com/33cn/plugin/plugin/dapp/valnode/types"
"github.com/gogo/protobuf/proto"
)
var (
......@@ -65,7 +66,7 @@ func (cs *ConsensusStore) LoadSeenCommit(height int64) *tmtypes.TendermintCommit
}
// SaveConsensusState save state and seenCommit
func (cs *ConsensusStore) SaveConsensusState(height int64, state *tmtypes.State, sc *tmtypes.TendermintCommit) error {
func (cs *ConsensusStore) SaveConsensusState(height int64, state *tmtypes.State, sc proto.Message) error {
seenCommitBytes := types.Encode(sc)
stateBytes := types.Encode(state)
batch := cs.db.NewBatch(true)
......
......@@ -473,7 +473,7 @@ func (client *Client) CommitBlock(block *types.Block) error {
retErr := client.WriteBlock(nil, block)
if retErr != nil {
tendermintlog.Info("CommitBlock fail", "err", retErr)
if client.WaitBlock(block.Height) == true {
if client.WaitBlock(block.Height) {
curBlock, err := client.RequestBlock(block.Height)
if err == nil {
if bytes.Equal(curBlock.Hash(), block.Hash()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment