fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-29 04:31:44 +00:00
Code Issues Projects Releases Wiki Activity

#2021 follow up (#2028)

Browse Source 
* update changelog

* txAvailable is always true

Refs #2021, #1920

* remove debug message

No additional value. `enterPropose` log message should be enough.

Refs #2021, #1920
This commit is contained in:
Anton Kaliaev
2018-07-23 16:47:15 +04:00
committed by GitHub
parent eb7dea1b0d
commit 94e8252607
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -7,13 +7,12 @@ BREAKING CHANGES:
- [libs/common] remove exponentially distributed random numbers - [libs/common] remove exponentially distributed random numbers
IMPROVEMENTS: 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 - [config] Increase default send/recv rates to 5 mB/s
- [libs/common] Generated gogoproto static marshaller methods
BUG FIXES 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 ## 0.22.4

5
consensus/state.go
View File

@ -571,10 +571,8 @@ func (cs *ConsensusState) receiveRoutine(maxSteps int) {
var mi msgInfo var mi msgInfo
select { select {
case txAvailable := <-cs.mempool.TxsAvailable(): case <-cs.mempool.TxsAvailable():
if txAvailable {
cs.handleTxsAvailable() cs.handleTxsAvailable()
}
case mi = <-cs.peerMsgQueue: case mi = <-cs.peerMsgQueue:
cs.wal.Write(mi) cs.wal.Write(mi)
// handles proposals, block parts, votes // handles proposals, block parts, votes
@ -689,7 +687,6 @@ func (cs *ConsensusState) handleTxsAvailable() {
cs.mtx.Lock() cs.mtx.Lock()
defer cs.mtx.Unlock() defer cs.mtx.Unlock()
// we only need to do this for round 0 // 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) cs.enterPropose(cs.Height, 0)
} }