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

rebase fixes

Browse Source
This commit is contained in:
Ethan Buchman
2016-01-14 19:04:01 -05:00
parent 6bcf53195f
commit 3b06368569
5 changed files with 10 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
consensus/replay.go
View File

@@ -2,7 +2,6 @@ package consensus
import (
"bufio"
"bytes"
"errors"
"fmt"
"io"
@@ -85,7 +84,7 @@ func (cs *ConsensusState) catchupReplay(height int) error {
}
m, ok := msg.Msg.(*types.EventDataRoundState)
if ok && m.Step == RoundStepNewHeight.String() {
r, err := f.Seek(0, 1)
f.Seek(0, 1)
// TODO: ensure the height matches
return true
}
@@ -203,7 +202,7 @@ func (pb *playback) replayReset(count int) error {
pb.cs.Stop()
newCs := NewConsensusState(pb.genesisState.Copy(), pb.cs.proxyAppCtx, pb.cs.blockStore, pb.cs.mempool)
newCs := NewConsensusState(pb.genesisState.Copy(), pb.cs.proxyAppConn, pb.cs.blockStore, pb.cs.mempool)
newCs.SetEventSwitch(pb.cs.evsw)
// ensure all new step events are regenerated as expected