fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-04-25 06:42:16 +00:00
Code Issues Projects Releases Wiki Activity

Remove BeginBlock

Browse Source
This commit is contained in:
Jae Kwon 2016-03-06 18:02:29 -08:00
parent 3adb579cf1
commit 18d0da4ea3
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
proxy/app_conn.go
View File

@ -20,6 +20,5 @@ type AppConn interface {
FlushSync() error FlushSync() error
CommitSync() (hash []byte, log string, err error) CommitSync() (hash []byte, log string, err error)
InitChainSync(validators []*tmsp.Validator) (err error) InitChainSync(validators []*tmsp.Validator) (err error)
BeginBlockSync(height uint64) (err error) EndBlockSync(height uint64) (changedValidators []*tmsp.Validator, err error)
EndBlockSync() (changedValidators []*tmsp.Validator, err error)
} }

13
proxy/local_app_conn.go
View File

@ -109,19 +109,10 @@ func (app *localAppConn) InitChainSync(validators []*tmsp.Validator) (err error)
return nil return nil
} }
func (app *localAppConn) BeginBlockSync(height uint64) (err error) { func (app *localAppConn) EndBlockSync(height uint64) (changedValidators []*tmsp.Validator, err error) {
app.mtx.Lock() app.mtx.Lock()
if bcApp, ok := app.Application.(tmsp.BlockchainAware); ok { if bcApp, ok := app.Application.(tmsp.BlockchainAware); ok {
bcApp.BeginBlock(height) changedValidators = bcApp.EndBlock(height)
}
app.mtx.Unlock()
return nil
}
func (app *localAppConn) EndBlockSync() (changedValidators []*tmsp.Validator, err error) {
app.mtx.Lock()
if bcApp, ok := app.Application.(tmsp.BlockchainAware); ok {
changedValidators = bcApp.EndBlock()
} }
app.mtx.Unlock() app.mtx.Unlock()
return changedValidators, nil return changedValidators, nil

9
state/execution.go
View File

@ -77,13 +77,6 @@ func (s *State) execBlockOnProxyApp(evsw *events.EventSwitch, proxyAppConn proxy
} }
proxyAppConn.SetResponseCallback(proxyCb) proxyAppConn.SetResponseCallback(proxyCb)
// Begin block
err := proxyAppConn.BeginBlockSync(uint64(block.Height))
if err != nil {
log.Warn("Error in proxyAppConn.BeginBlock", "error", err)
return err
}
// Run txs of block // Run txs of block
for _, tx := range block.Txs { for _, tx := range block.Txs {
proxyAppConn.AppendTxAsync(tx) proxyAppConn.AppendTxAsync(tx)
@ -93,7 +86,7 @@ func (s *State) execBlockOnProxyApp(evsw *events.EventSwitch, proxyAppConn proxy
} }
// End block // End block
changedValidators, err := proxyAppConn.EndBlockSync() changedValidators, err := proxyAppConn.EndBlockSync(uint64(block.Height))
if err != nil { if err != nil {
log.Warn("Error in proxyAppConn.EndBlock", "error", err) log.Warn("Error in proxyAppConn.EndBlock", "error", err)
return err return err