Commit 8fdb6cbf authored by gitlab's avatar gitlab

auto ci

parent 286dcbfa
......@@ -216,7 +216,7 @@ func (cs *ConsensusState) Start() {
// Stop timer and receive routine
func (cs *ConsensusState) Stop() {
cs.timeoutTicker.Stop()
cs.Quit <-struct{}{}
cs.Quit <- struct{}{}
}
//------------------------------------------------------------
......
......@@ -22,12 +22,12 @@ import (
)
const (
numBufferedConnections = 10
maxNumPeers = 50
tryListenSeconds = 5
handshakeTimeout = 20 // * time.Second,
maxSendQueueSize = 1024
defaultSendTimeout = 60 * time.Second
numBufferedConnections = 10
maxNumPeers = 50
tryListenSeconds = 5
handshakeTimeout = 20 // * time.Second,
maxSendQueueSize = 1024
defaultSendTimeout = 60 * time.Second
//MaxMsgPacketPayloadSize define
MaxMsgPacketPayloadSize = 10 * 1024 * 1024
defaultDialTimeout = 3 * time.Second
......
......@@ -182,13 +182,13 @@ func (sc *SecretConnection) Read(data []byte) (n int, err error) {
}
// Close Implements net.Conn
func (sc *SecretConnection) Close() error { return sc.conn.Close() }
func (sc *SecretConnection) Close() error { return sc.conn.Close() }
// LocalAddr ...
func (sc *SecretConnection) LocalAddr() net.Addr { return sc.conn.(net.Conn).LocalAddr() }
func (sc *SecretConnection) LocalAddr() net.Addr { return sc.conn.(net.Conn).LocalAddr() }
// RemoteAddr ...
func (sc *SecretConnection) RemoteAddr() net.Addr { return sc.conn.(net.Conn).RemoteAddr() }
func (sc *SecretConnection) RemoteAddr() net.Addr { return sc.conn.(net.Conn).RemoteAddr() }
// SetDeadline ...
func (sc *SecretConnection) SetDeadline(t time.Time) error { return sc.conn.(net.Conn).SetDeadline(t) }
......@@ -352,7 +352,7 @@ func incr2Nonce(nonce *[24]byte) {
// increment nonce big-endian by 1 with wraparound.
func incrNonce(nonce *[24]byte) {
for i := 23; 0 <= i; i-- {
nonce[i] ++
nonce[i]++
if nonce[i] != 0 {
return
}
......
......@@ -38,7 +38,7 @@ var (
timeoutCommit int32 = 1000
skipTimeoutCommit = false
createEmptyBlocks = false
createEmptyBlocksInterval int32 // second
createEmptyBlocksInterval int32 // second
validatorNodes = []string{"127.0.0.1:46656"}
peerGossipSleepDuration int32 = 100
peerQueryMaj23SleepDuration int32 = 2000
......
......@@ -29,6 +29,7 @@ const fee = 1e6
const letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
var r *rand.Rand
// TxHeightOffset needed
var TxHeightOffset int64
......
......@@ -21,7 +21,7 @@ import (
)
var (
blocklog = log15.New("module", "tendermint-block")
blocklog = log15.New("module", "tendermint-block")
// ConsensusCrypto define
ConsensusCrypto crypto.Crypto
)
......
......@@ -43,7 +43,7 @@ const (
// EvidenceType map define
var (
EvidenceType2Type map[string]reflect.Type
EvidenceType2Obj map[string]Evidence
EvidenceType2Obj map[string]Evidence
)
// Evidence represents any provable malicious activity by a validator
......@@ -270,13 +270,13 @@ func NewMockGoodEvidence(height int64, index int, address []byte) MockGoodEviden
}
// Height ...
func (e MockGoodEvidence) Height() int64 { return e.MGHeight }
func (e MockGoodEvidence) Height() int64 { return e.MGHeight }
// Address ...
func (e MockGoodEvidence) Address() []byte { return e.MGAddress }
// Index ...
func (e MockGoodEvidence) Index() int { return e.MGIndex }
func (e MockGoodEvidence) Index() int { return e.MGIndex }
// Hash ...
func (e MockGoodEvidence) Hash() []byte {
......@@ -373,7 +373,7 @@ type MockEvidencePool struct {
func (m MockEvidencePool) PendingEvidence() []Evidence { return nil }
// AddEvidence ...
func (m MockEvidencePool) AddEvidence(Evidence) error { return nil }
func (m MockEvidencePool) AddEvidence(Evidence) error { return nil }
// Update ...
func (m MockEvidencePool) Update(*TendermintBlock) {}
func (m MockEvidencePool) Update(*TendermintBlock) {}
......@@ -31,7 +31,7 @@ var (
randgen *rand.Rand
randMux sync.Mutex
// Fmt ...
Fmt = fmt.Sprintf
Fmt = fmt.Sprintf
)
// Init ...
......@@ -143,6 +143,7 @@ func MinInt(a, b int) int {
}
return b
}
// MaxInt ...
func MaxInt(a, b int) int {
if a > b {
......
......@@ -320,7 +320,7 @@ func (voteSet *VoteSet) SetPeerMaj23(peerID string, blockID *tmtypes.BlockID) {
if votesByBlock.peerMaj23 {
return // Nothing to do
}
votesByBlock.peerMaj23 = true // No need to copy votes, already there.
votesByBlock.peerMaj23 = true // No need to copy votes, already there.
} else {
votesByBlock = newBlockVotes(true, voteSet.valSet.Size())
voteSet.votesByBlock[blockKey] = votesByBlock
......
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