btc payload streamer

pkg/super_node/eth/converter.go

@@ -31,14 +31,15 @@ type PayloadConverter struct {
 	chainConfig *params.ChainConfig
 }
 
-// NewPayloadConverter creates a pointer to a new Converter which satisfies the PayloadConverter interface
+// NewPayloadConverter creates a pointer to a new PayloadConverter which satisfies the PayloadConverter interface
 func NewPayloadConverter(chainConfig *params.ChainConfig) *PayloadConverter {
 	return &PayloadConverter{
 		chainConfig: chainConfig,
 	}
 }
 
-// Convert method is used to convert a geth statediff.Payload to a IPLDPayload
+// Convert method is used to convert a eth statediff.Payload to an IPLDPayload
+// Satisfies the shared.PayloadConverter interface
 func (pc *PayloadConverter) Convert(payload interface{}) (interface{}, error) {
 	stateDiffPayload, ok := payload.(statediff.Payload)
 	if !ok {
@@ -60,7 +61,7 @@ func (pc *PayloadConverter) Convert(payload interface{}) (interface{}, error) {
 		TotalDifficulty: stateDiffPayload.TotalDifficulty,
 		Block:           block,
 		HeaderRLP:       headerRlp,
-		TrxMetaData:     make([]TxModel, 0, trxLen),
+		TxMetaData:      make([]TxModel, 0, trxLen),
 		Receipts:        make(types.Receipts, 0, trxLen),
 		ReceiptMetaData: make([]ReceiptModel, 0, trxLen),
 		StateNodes:      make([]TrieNode, 0),
@@ -81,7 +82,7 @@ func (pc *PayloadConverter) Convert(payload interface{}) (interface{}, error) {
 			Index:  int64(i),
 		}
 		// txMeta will have same index as its corresponding trx in the convertedPayload.BlockBody
-		convertedPayload.TrxMetaData = append(convertedPayload.TrxMetaData, txMeta)
+		convertedPayload.TxMetaData = append(convertedPayload.TxMetaData, txMeta)
 	}
 
 	// Decode receipts for this block

pkg/super_node/eth/converter_test.go

@@ -45,7 +45,7 @@ var _ = Describe("Converter", func() {
 			Expect(err).ToNot(HaveOccurred())
 			Expect(gotBody).To(Equal(expectedBody))
 			Expect(convertedPayload.HeaderRLP).To(Equal(mocks.MockHeaderRlp))
-			Expect(convertedPayload.TrxMetaData).To(Equal(mocks.MockTrxMeta))
+			Expect(convertedPayload.TxMetaData).To(Equal(mocks.MockTrxMeta))
 			Expect(convertedPayload.ReceiptMetaData).To(Equal(mocks.MockRctMeta))
 		})
 	})

pkg/super_node/eth/filterer.go

@@ -102,7 +102,7 @@ func (s *ResponseFilterer) filterTransactions(trxFilter config.TxFilter, respons
 	trxHashes := make([]common.Hash, 0, len(payload.Block.Body().Transactions))
 	if !trxFilter.Off {
 		for i, trx := range payload.Block.Body().Transactions {
-			if checkTransactions(trxFilter.Src, trxFilter.Dst, payload.TrxMetaData[i].Src, payload.TrxMetaData[i].Dst) {
+			if checkTransactions(trxFilter.Src, trxFilter.Dst, payload.TxMetaData[i].Src, payload.TxMetaData[i].Dst) {
 				trxBuffer := new(bytes.Buffer)
 				if err := trx.EncodeRLP(trxBuffer); err != nil {
 					return nil, err

pkg/super_node/eth/mocks/test_data.go

@@ -238,7 +238,7 @@ var (
 		Block:           MockBlock,
 		Receipts:        MockReceipts,
 		HeaderRLP:       MockHeaderRlp,
-		TrxMetaData:     MockTrxMeta,
+		TxMetaData:      MockTrxMeta,
 		ReceiptMetaData: MockRctMeta,
 		StorageNodes:    MockStorageNodes,
 		StateNodes:      MockStateNodes,

pkg/super_node/eth/publisher.go

@@ -95,7 +95,7 @@ func (pub *IPLDPublisher) Publish(payload interface{}) (interface{}, error) {
 	}
 
 	// Process and publish transactions
-	transactionCids, err := pub.publishTransactions(ipldPayload.Block.Body(), ipldPayload.TrxMetaData)
+	transactionCids, err := pub.publishTransactions(ipldPayload.Block.Body(), ipldPayload.TxMetaData)
 	if err != nil {
 		return nil, err
 	}

pkg/super_node/eth/streamer.go

@@ -17,8 +17,8 @@
 package eth
 
 import (
-	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/sirupsen/logrus"
+	"github.com/vulcanize/vulcanizedb/pkg/super_node/shared"
 
 	"github.com/vulcanize/vulcanizedb/pkg/eth/core"
 )
@@ -32,7 +32,7 @@ type PayloadStreamer struct {
 	Client core.RPCClient
 }
 
-// NewPayloadStreamer creates a pointer to a new StateDiffStreamer which satisfies the PayloadStreamer interface
+// NewPayloadStreamer creates a pointer to a new PayloadStreamer which satisfies the PayloadStreamer interface for ethereum
 func NewPayloadStreamer(client core.RPCClient) *PayloadStreamer {
 	return &PayloadStreamer{
 		Client: client,
@@ -40,7 +40,8 @@ func NewPayloadStreamer(client core.RPCClient) *PayloadStreamer {
 }
 
 // Stream is the main loop for subscribing to data from the Geth state diff process
-func (sds *PayloadStreamer) Stream(payloadChan chan interface{}) (*rpc.ClientSubscription, error) {
+// Satisfies the shared.PayloadStreamer interface
+func (ps *PayloadStreamer) Stream(payloadChan chan interface{}) (shared.ClientSubscription, error) {
 	logrus.Info("streaming diffs from geth")
-	return sds.Client.Subscribe("statediff", payloadChan, "stream")
+	return ps.Client.Subscribe("statediff", payloadChan, "stream")
 }

pkg/super_node/eth/streamer_test.go

@@ -18,7 +18,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/vulcanize/vulcanizedb/pkg/fakes"
+	"github.com/vulcanize/vulcanizedb/pkg/eth/fakes"
 	"github.com/vulcanize/vulcanizedb/pkg/super_node/eth"
 )
 

pkg/super_node/eth/types.go

@@ -32,7 +32,7 @@ type IPLDPayload struct {
 	TotalDifficulty *big.Int
 	Block           *types.Block
 	HeaderRLP       []byte
-	TrxMetaData     []TxModel
+	TxMetaData      []TxModel
 	Receipts        types.Receipts
 	ReceiptMetaData []ReceiptModel
 	StateNodes      []TrieNode