From fb47ca6d35e43e9254c7d94e9694472001320dbb Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Fri, 4 Aug 2017 21:36:11 -0400 Subject: [PATCH] fixes from review --- consensus/state.go | 6 +++++- mempool/mempool.go | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/consensus/state.go b/consensus/state.go index e6fd665a5..e3a153651 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -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) } } diff --git a/mempool/mempool.go b/mempool/mempool.go index 9f9824f9e..6113910b7 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -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!") }