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

Merge branch 'develop' into anton/new-pubsub

Browse Source
This commit is contained in:
Anton Kaliaev
2019-02-13 11:47:14 +04:00
committed by GitHub
parent b30cb5fde9 d32f7d2416
commit f1d63ede26
75 changed files with 1303 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
consensus/replay.go
View File

@ -336,7 +336,7 @@ func (h *Handshaker) ReplayBlocks(
} else if storeBlockHeight < appBlockHeight {
// the app should never be ahead of the store (but this is under app's control)
return appHash, sm.ErrAppBlockHeightTooHigh{storeBlockHeight, appBlockHeight}
return appHash, sm.ErrAppBlockHeightTooHigh{CoreHeight: storeBlockHeight, AppHeight: appBlockHeight}
} else if storeBlockHeight < stateBlockHeight {
// the state should never be ahead of the store (this is under tendermint's control)