post rebase fixes

glide.lock

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

node/node.go

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

state/execution.go

@@ -196,7 +196,7 @@ func (s *State) validateBlock(block *types.Block) error {
 // ApplyBlock executes the block, then commits and updates the mempool atomically
 
 // 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 {
 
 	// Run the block on the State:
@@ -365,7 +365,7 @@ func loadApplyBlock(blockIndex int, s *State, blockStore proxy.BlockStore, appCo
 	block := blockStore.LoadBlock(blockIndex)
 	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{})
 }