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

post rebase fixes

Browse Source
This commit is contained in:
Ethan Buchman 2016-11-03 20:38:09 -04:00
parent 3f90fcae48
commit befd8b0cb2
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glide.lock generated
View File

@ -92,7 +92,7 @@ imports:
subpackages: subpackages:
- term - term
- name: github.com/tendermint/tmsp - name: github.com/tendermint/tmsp
version: eece35eeebacee1ab94b8338e77e0d1c2d880ecc version: fec038bdec3495a2a06c6aa8f63e9716bad335dd
subpackages: subpackages:
- client - client
- example/counter - example/counter

3
node/node.go
View File

@ -391,8 +391,7 @@ func newConsensusState(config cfg.Config) *consensus.ConsensusState {
// Make event switch // Make event switch
eventSwitch := types.NewEventSwitch() eventSwitch := types.NewEventSwitch()
_, err := eventSwitch.Start() if _, err := eventSwitch.Start(); err != nil {
if err != nil {
Exit(Fmt("Failed to start event switch: %v", err)) Exit(Fmt("Failed to start event switch: %v", err))
} }

4
state/execution.go
View File

@ -196,7 +196,7 @@ func (s *State) validateBlock(block *types.Block) error {
// ApplyBlock executes the block, then commits and updates the mempool atomically // ApplyBlock executes the block, then commits and updates the mempool atomically
// Execute and commit block against app, save block and state // Execute and commit block against app, save block and state
func (s *State) ApplyBlock(eventCache events.Fireable, proxyAppConn proxy.AppConnConsensus, func (s *State) ApplyBlock(eventCache types.Fireable, proxyAppConn proxy.AppConnConsensus,
block *types.Block, partsHeader types.PartSetHeader, mempool Mempool) error { block *types.Block, partsHeader types.PartSetHeader, mempool Mempool) error {
// Run the block on the State: // Run the block on the State:
@ -365,7 +365,7 @@ func loadApplyBlock(blockIndex int, s *State, blockStore proxy.BlockStore, appCo
block := blockStore.LoadBlock(blockIndex) block := blockStore.LoadBlock(blockIndex)
panicOnNilBlock(blockIndex, blockStore.Height(), block, blockMeta) // XXX panicOnNilBlock(blockIndex, blockStore.Height(), block, blockMeta) // XXX
var eventCache events.Fireable // nil var eventCache types.Fireable // nil
return s.ApplyBlock(eventCache, appConnConsensus, block, blockMeta.PartsHeader, mockMempool{}) return s.ApplyBlock(eventCache, appConnConsensus, block, blockMeta.PartsHeader, mockMempool{})
} }