Browse Source

#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
pull/2031/head
Anton Kaliaev 6 years ago
committed by GitHub
parent
commit
94e8252607
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
  1. +4
    -5
      CHANGELOG.md
  2. +2
    -5
      consensus/state.go

+ 4
- 5
CHANGELOG.md View File

@ -3,17 +3,16 @@
## TBA ## TBA
BREAKING CHANGES: BREAKING CHANGES:
- [crypto] Refactor `tendermint/crypto` into many subpackages
- [crypto] Refactor `tendermint/crypto` into many subpackages
- [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


+ 2
- 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():
if txAvailable {
cs.handleTxsAvailable()
}
case <-cs.mempool.TxsAvailable():
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)
} }


Loading…
Cancel
Save