Browse Source

fixes from review

pull/584/head
Ethan Buchman 7 years ago
parent
commit
fb47ca6d35
2 changed files with 8 additions and 4 deletions
  1. +5
    -1
      consensus/state.go
  2. +3
    -3
      mempool/mempool.go

+ 5
- 1
consensus/state.go View File

@ -24,6 +24,10 @@ import (
//-----------------------------------------------------------------------------
// Config
const (
proposalHeartbeatIntervalSeconds = 2
)
//-----------------------------------------------------------------------------
// Errors
@ -833,7 +837,7 @@ func (cs *ConsensusState) proposalHeartbeat(height, round int) {
heartbeatEvent := types.EventDataProposalHeartbeat{heartbeat}
types.FireEventProposalHeartbeat(cs.evsw, heartbeatEvent)
counter += 1
time.Sleep(time.Second)
time.Sleep(proposalHeartbeatIntervalSeconds * time.Second)
}
}


+ 3
- 3
mempool/mempool.go View File

@ -224,7 +224,7 @@ func (mem *Mempool) resCbNormal(req *abci.Request, res *abci.Response) {
tx: req.GetCheckTx().Tx,
}
mem.txs.PushBack(memTx)
mem.notifyIfTxsAvailable()
mem.notifyTxsAvailable()
} else {
// ignore bad transaction
mem.logger.Info("Bad Transaction", "res", r)
@ -267,7 +267,7 @@ func (mem *Mempool) resCbRecheck(req *abci.Request, res *abci.Response) {
atomic.StoreInt32(&mem.rechecking, 0)
mem.logger.Info("Done rechecking txs")
mem.notifyIfTxsAvailable()
mem.notifyTxsAvailable()
}
default:
// ignore other messages
@ -281,7 +281,7 @@ func (mem *Mempool) TxsAvailable() chan int {
return mem.txsAvailable
}
func (mem *Mempool) notifyIfTxsAvailable() {
func (mem *Mempool) notifyTxsAvailable() {
if mem.Size() == 0 {
panic("notified txs available but mempool is empty!")
}


Loading…
Cancel
Save