From 94e8252607997df7494000a91d621b221763d2d3 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Mon, 23 Jul 2018 16:47:15 +0400 Subject: [PATCH] #2021 follow up (#2028) * update changelog * txAvailable is always true Refs #2021, #1920 * remove debug message No additional value. `enterPropose` log message should be enough. Refs #2021, #1920 --- CHANGELOG.md | 9 ++++----- consensus/state.go | 7 ++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25ed8ea97..ff8861a5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,17 +3,16 @@ ## TBA BREAKING CHANGES: -- [crypto] Refactor `tendermint/crypto` into many subpackages +- [crypto] Refactor `tendermint/crypto` into many subpackages - [libs/common] remove exponentially distributed random numbers IMPROVEMENTS: -- [abci] Generated gogoproto static marshaller methods +- [abci, libs/common] Generated gogoproto static marshaller methods - [config] Increase default send/recv rates to 5 mB/s -- [libs/common] Generated gogoproto static marshaller methods BUG FIXES -- [mempool] fixed a race condition when create_empty_blocks=false where a transaction is published at an old height - +- [mempool] fixed a race condition when `create_empty_blocks=false` where a + transaction is published at an old height. ## 0.22.4 diff --git a/consensus/state.go b/consensus/state.go index 3aa36042f..634f10313 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -571,10 +571,8 @@ func (cs *ConsensusState) receiveRoutine(maxSteps int) { var mi msgInfo select { - case txAvailable := <-cs.mempool.TxsAvailable(): - if txAvailable { - cs.handleTxsAvailable() - } + case <-cs.mempool.TxsAvailable(): + cs.handleTxsAvailable() case mi = <-cs.peerMsgQueue: cs.wal.Write(mi) // handles proposals, block parts, votes @@ -689,7 +687,6 @@ func (cs *ConsensusState) handleTxsAvailable() { cs.mtx.Lock() defer cs.mtx.Unlock() // we only need to do this for round 0 - cs.Logger.Debug("handling available txs", "height to propose", cs.Height) cs.enterPropose(cs.Height, 0) }