state.ApplyBlock takes evpool and calls MarkEvidenceAsCommitted

This commit is contained in:
Ethan Buchman
2017-11-19 22:44:46 +00:00
parent 3271634e7a
commit 869d873d5c
8 changed files with 27 additions and 29 deletions

View File

@ -327,7 +327,8 @@ func (s *State) validateBlock(b *types.Block) error {
// commits it, and saves the block and state. It's the only function that needs to be called
// from outside this package to process and commit an entire block.
func (s *State) ApplyBlock(txEventPublisher types.TxEventPublisher, proxyAppConn proxy.AppConnConsensus,
block *types.Block, partsHeader types.PartSetHeader, mempool types.Mempool) error {
block *types.Block, partsHeader types.PartSetHeader,
mempool types.Mempool, evpool types.EvidencePool) error {
abciResponses, err := s.ValExecBlock(txEventPublisher, proxyAppConn, block)
if err != nil {
@ -355,6 +356,8 @@ func (s *State) ApplyBlock(txEventPublisher types.TxEventPublisher, proxyAppConn
fail.Fail() // XXX
evpool.MarkEvidenceAsCommitted(block.Evidence.Evidence)
// save the state and the validators
s.Save()