Merge e539790 into b145ed4

cmd/indexer/internal/processor/block.go → cmd/indexer/internal/actions/block.go

@@ -1,8 +1,8 @@
-package processor
+package actions
 
 import "context"
 
-//go:generate mockgen -source=block.go -package=processortest -destination=./processortest/block_mock.go
+//go:generate mockgen -source=block.go -package=actionstest -destination=./actionstest/block_mock.go
 
 // Block processes an individual block
 type Block interface {

cmd/indexer/internal/processor/transaction.go → cmd/indexer/internal/actions/transaction.go

@@ -1,4 +1,4 @@
-package processor
+package actions
 
 import (
 	"bytes"
@@ -8,7 +8,7 @@ import (
 	"github.com/mailchain/mailchain/encoding"
 )
 
-//go:generate mockgen -source=transaction.go -package=processortest -destination=./processortest/transaction_mock.go
+//go:generate mockgen -source=transaction.go -package=actionstest -destination=./actionstest/transaction_mock.go
 
 // Transaction processes transactions
 type Transaction interface {

cmd/indexer/internal/ethereum/block.go

@@ -5,11 +5,11 @@ import (
 	"errors"
 
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/mailchain/mailchain/cmd/indexer/internal/processor"
+	"github.com/mailchain/mailchain/cmd/indexer/internal/actions"
 )
 
 type Block struct {
-	txProcessor processor.Transaction
+	txProcessor actions.Transaction
 }
 
 func (b *Block) Run(ctx context.Context, protocol, network string, blk interface{}) error {

cmd/indexer/internal/ethereum/transaction.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/params"
+	"github.com/mailchain/mailchain/cmd/indexer/internal/actions"
 	"github.com/mailchain/mailchain/cmd/indexer/internal/datastore"
-	"github.com/mailchain/mailchain/cmd/indexer/internal/processor"
 	"github.com/mailchain/mailchain/crypto/secp256k1"
 	"github.com/mailchain/mailchain/internal/protocols/ethereum"
 )
@@ -25,7 +25,7 @@ type txOptions struct {
 	block *types.Block
 }
 
-func (t *Transaction) Run(ctx context.Context, protocol, network string, tx interface{}, txOpts processor.TransactionOptions) error {
+func (t *Transaction) Run(ctx context.Context, protocol, network string, tx interface{}, txOpts actions.TransactionOptions) error {
 	// blk *types.Block, ethTx *types.Transaction
 	ethTx, ok := tx.(*types.Transaction)
 	if !ok {
@@ -64,7 +64,7 @@ func (t *Transaction) Run(ctx context.Context, protocol, network string, tx inte
 		return err
 	}
 
-	return processor.StoreTransaction(ctx, t.txStore, t.rawTxStore, protocol, network, storeTx, ethTx)
+	return actions.StoreTransaction(ctx, t.txStore, t.rawTxStore, protocol, network, storeTx, ethTx)
 }
 
 func (t *Transaction) toTransaction(blk *types.Block, tx *types.Transaction) (*datastore.Transaction, error) {

cmd/indexer/internal/processor/sequential.go

@@ -3,6 +3,7 @@ package processor
 import (
 	"context"
 
+	"github.com/mailchain/mailchain/cmd/indexer/internal/actions"
 	"github.com/mailchain/mailchain/cmd/indexer/internal/clients"
 	"github.com/mailchain/mailchain/cmd/indexer/internal/datastore"
 )
@@ -12,7 +13,7 @@ type Sequential struct {
 	network  string
 
 	syncStore      datastore.SyncStore
-	blockProcessor Block
+	blockProcessor actions.Block
 	blockClient    clients.BlockByNumber
 }