mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-02-03 18:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Callum Waters
2021-10-20 11:34:44 +02:00
parent 102f1f5af6
commit e2d8666782
5 changed files with 85 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
node/node.go
View File

@@ -534,7 +534,7 @@ func (n *nodeImpl) OnStart() error {
// the state, can call `InitChain` if this is the first time that the
// application has run and replays any blocks as necessary to sync
// tendermint with the app. We do all this before starting any other service
err = syncWithApplication(n.stateStore, n.blockStore, n.genesisDoc, state,
state, err = sm.SyncWithApplication(n.stateStore, n.blockStore, n.genesisDoc, state,
n.eventBus, n.proxyApp, n.stateSync, n.Logger)
if err != nil {
return err