fix compile batch 1

state/indexer/eventsink.go

@@ -5,7 +5,7 @@ import (
 
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/libs/pubsub/query"
-	"github.com/tendermint/tendermint/types"
+	"github.com/tendermint/tendermint/pkg/events"
 )
 
 type EventSinkType string
@@ -26,7 +26,7 @@ const (
 type EventSink interface {
 
 	// IndexBlockEvents indexes the blockheader.
-	IndexBlockEvents(types.EventDataNewBlockHeader) error
+	IndexBlockEvents(events.EventDataNewBlockHeader) error
 
 	// IndexTxEvents indexes the given result of transactions. To call it with multi transactions,
 	// must guarantee the index of given transactions are in order.

state/indexer/indexer.go

@@ -6,7 +6,7 @@ import (
 
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/libs/pubsub/query"
-	"github.com/tendermint/tendermint/types"
+	"github.com/tendermint/tendermint/pkg/events"
 )
 
 // TxIndexer interface defines methods to index and search transactions.
@@ -31,7 +31,7 @@ type BlockIndexer interface {
 	Has(height int64) (bool, error)
 
 	// Index indexes BeginBlock and EndBlock events for a given block by its height.
-	Index(types.EventDataNewBlockHeader) error
+	Index(events.EventDataNewBlockHeader) error
 
 	// Search performs a query for block heights that match a given BeginBlock
 	// and Endblock event search criteria.

state/indexer/indexer_service.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/tendermint/tendermint/libs/service"
-	"github.com/tendermint/tendermint/types"
+	"github.com/tendermint/tendermint/pkg/events"
 )
 
 // XXX/TODO: These types should be moved to the indexer package.
@@ -19,12 +19,11 @@ type Service struct {
 	service.BaseService
 
 	eventSinks []EventSink
-	eventBus   *types.EventBus
+	eventBus   *events.EventBus
 }
 
 // NewIndexerService returns a new service instance.
-func NewIndexerService(es []EventSink, eventBus *types.EventBus) *Service {
-
+func NewIndexerService(es []EventSink, eventBus *events.EventBus) *Service {
 	is := &Service{eventSinks: es, eventBus: eventBus}
 	is.BaseService = *service.NewBaseService(nil, "IndexerService", is)
 	return is
@@ -39,12 +38,12 @@ func (is *Service) OnStart() error {
 	blockHeadersSub, err := is.eventBus.SubscribeUnbuffered(
 		context.Background(),
 		subscriber,
-		types.EventQueryNewBlockHeader)
+		events.EventQueryNewBlockHeader)
 	if err != nil {
 		return err
 	}
 
-	txsSub, err := is.eventBus.SubscribeUnbuffered(context.Background(), subscriber, types.EventQueryTx)
+	txsSub, err := is.eventBus.SubscribeUnbuffered(context.Background(), subscriber, events.EventQueryTx)
 	if err != nil {
 		return err
 	}
@@ -53,13 +52,13 @@ func (is *Service) OnStart() error {
 		for {
 			msg := <-blockHeadersSub.Out()
 
-			eventDataHeader := msg.Data().(types.EventDataNewBlockHeader)
+			eventDataHeader := msg.Data().(events.EventDataNewBlockHeader)
 			height := eventDataHeader.Header.Height
 			batch := NewBatch(eventDataHeader.NumTxs)
 
 			for i := int64(0); i < eventDataHeader.NumTxs; i++ {
 				msg2 := <-txsSub.Out()
-				txResult := msg2.Data().(types.EventDataTx).TxResult
+				txResult := msg2.Data().(events.EventDataTx).TxResult
 
 				if err = batch.Add(&txResult); err != nil {
 					is.Logger.Error(

state/indexer/sink/null/null.go

@@ -5,8 +5,8 @@ import (
 
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/libs/pubsub/query"
+	"github.com/tendermint/tendermint/pkg/events"
 	"github.com/tendermint/tendermint/state/indexer"
-	"github.com/tendermint/tendermint/types"
 )
 
 var _ indexer.EventSink = (*EventSink)(nil)
@@ -22,7 +22,7 @@ func (nes *EventSink) Type() indexer.EventSinkType {
 	return indexer.NULL
 }
 
-func (nes *EventSink) IndexBlockEvents(bh types.EventDataNewBlockHeader) error {
+func (nes *EventSink) IndexBlockEvents(bh events.EventDataNewBlockHeader) error {
 	return nil
 }
 

state/indexer/tx/kv/kv.go

@@ -13,6 +13,7 @@ import (
 
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/libs/pubsub/query"
+	"github.com/tendermint/tendermint/pkg/mempool"
 	indexer "github.com/tendermint/tendermint/state/indexer"
 	"github.com/tendermint/tendermint/types"
 )
@@ -67,7 +68,7 @@ func (txi *TxIndex) Index(results []*abci.TxResult) error {
 	defer b.Close()
 
 	for _, result := range results {
-		hash := types.Tx(result.Tx).Hash()
+		hash := mempool.Tx(result.Tx).Hash()
 
 		// index tx by events
 		err := txi.indexEvents(result, hash, b)