mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-01-07 13:55:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into callum/4728-check-evidence

Browse Source
This commit is contained in:
Callum Waters
2020-04-29 14:04:04 +02:00
committed by GitHub
parent 82eb56b3e0 8108ac9d17
commit ba967c077b
54 changed files with 10344 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
blockchain/v2/reactor_test.go
View File

@@ -118,7 +118,7 @@ func (sio *mockSwitchIo) sendBlockNotFound(height int64, peerID p2p.ID) error {
return nil
}
func (sio *mockSwitchIo) trySwitchToConsensus(state sm.State, blocksSynced int) {
func (sio *mockSwitchIo) trySwitchToConsensus(state sm.State, skipWAL bool) {
sio.mtx.Lock()
defer sio.mtx.Unlock()
sio.switchedToConsensus = true
@@ -157,7 +157,7 @@ func newTestReactor(p testReactorParams) *BlockchainReactor {
sm.SaveState(db, state)
}
r := newReactor(state, store, reporter, appl, p.bufferSize)
r := newReactor(state, store, reporter, appl, p.bufferSize, true)
logger := log.TestingLogger()
r.SetLogger(logger.With("module", "blockchain"))