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

merge/rebase fixes

Browse Source
This commit is contained in:
Ethan Buchman
2016-01-12 19:30:31 -05:00
parent ee449a94c8
commit 799efb0629
6 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
state/execution.go
View File

@ -5,7 +5,7 @@ import (
"fmt"
. "github.com/tendermint/go-common"
"github.com/tendermint/tendermint/events"
"github.com/tendermint/go-events"
"github.com/tendermint/tendermint/proxy"
"github.com/tendermint/tendermint/types"
tmsp "github.com/tendermint/tmsp/types"
@ -90,7 +90,7 @@ func (s *State) execBlockOnProxyApp(evsw *events.EventSwitch, proxyAppConn proxy
log.Warn("Error computing proxyAppConn hash", "error", err)
return err
}
log.Info("ExecBlock got %v valid txs and %v invalid txs", validTxs, invalidTxs)
log.Info(Fmt("ExecBlock got %v valid txs and %v invalid txs", validTxs, invalidTxs))
// Set the state's new AppHash
s.AppHash = hash