changes to super node to improve compatibility with watcher

pkg/super_node/shared/intefaces.go

@@ -32,12 +32,12 @@ type PayloadFetcher interface {
 
 // PayloadConverter converts chain-specific payloads into IPLD payloads for publishing
 type PayloadConverter interface {
-	Convert(payload RawChainData) (StreamedIPLDs, error)
+	Convert(payload RawChainData) (ConvertedData, error)
 }
 
 // IPLDPublisher publishes IPLD payloads and returns a CID payload for indexing
 type IPLDPublisher interface {
-	Publish(payload StreamedIPLDs) (CIDsForIndexing, error)
+	Publish(payload ConvertedData) (CIDsForIndexing, error)
 }
 
 // CIDIndexer indexes a CID payload in Postgres
@@ -47,7 +47,7 @@ type CIDIndexer interface {
 
 // ResponseFilterer applies a filter to an IPLD payload to return a subscription response packet
 type ResponseFilterer interface {
-	Filter(filter SubscriptionSettings, payload StreamedIPLDs) (response ServerResponse, err error)
+	Filter(filter SubscriptionSettings, payload ConvertedData) (response IPLDs, err error)
 }
 
 // CIDRetriever retrieves cids according to a provided filter and returns a CID wrapper
@@ -60,12 +60,7 @@ type CIDRetriever interface {
 
 // IPLDFetcher uses a CID wrapper to fetch an IPLD wrapper
 type IPLDFetcher interface {
-	Fetch(cids CIDsForFetching) (FetchedIPLDs, error)
-}
-
-// IPLDResolver resolves an IPLD wrapper into chain-specific payloads
-type IPLDResolver interface {
-	Resolve(iplds FetchedIPLDs) (ServerResponse, error)
+	Fetch(cids CIDsForFetching) (IPLDs, error)
 }
 
 // ClientSubscription is a general interface for chain data subscriptions

pkg/super_node/shared/mocks/payload_fetcher.go

@@ -23,8 +23,8 @@ import (
 	"github.com/vulcanize/vulcanizedb/pkg/super_node/shared"
 )
 
-// IPLDFetcher mock for tests
-type IPLDFetcher struct {
+// PayloadFetcher mock for tests
+type PayloadFetcher struct {
 	PayloadsToReturn     map[uint64]shared.RawChainData
 	FetchErrs            map[uint64]error
 	CalledAtBlockHeights [][]uint64
@@ -32,7 +32,7 @@ type IPLDFetcher struct {
 }
 
 // FetchAt mock method
-func (fetcher *IPLDFetcher) FetchAt(blockHeights []uint64) ([]shared.RawChainData, error) {
+func (fetcher *PayloadFetcher) FetchAt(blockHeights []uint64) ([]shared.RawChainData, error) {
 	if fetcher.PayloadsToReturn == nil {
 		return nil, errors.New("mock StateDiffFetcher needs to be initialized with payloads to return")
 	}

pkg/super_node/shared/mocks/retriever.go

@@ -21,8 +21,8 @@ import (
 	"github.com/vulcanize/vulcanizedb/pkg/super_node/shared"
 )
 
-// MockCIDRetriever is a mock CID retriever for use in tests
-type MockCIDRetriever struct {
+// CIDRetriever is a mock CID retriever for use in tests
+type CIDRetriever struct {
 	GapsToRetrieve              []shared.Gap
 	GapsToRetrieveErr           error
 	CalledTimes                 int
@@ -31,34 +31,34 @@ type MockCIDRetriever struct {
 }
 
 // RetrieveCIDs mock method
-func (*MockCIDRetriever) Retrieve(filter shared.SubscriptionSettings, blockNumber int64) (shared.CIDsForFetching, bool, error) {
+func (*CIDRetriever) Retrieve(filter shared.SubscriptionSettings, blockNumber int64) (shared.CIDsForFetching, bool, error) {
 	panic("implement me")
 }
 
 // RetrieveLastBlockNumber mock method
-func (*MockCIDRetriever) RetrieveLastBlockNumber() (int64, error) {
+func (*CIDRetriever) RetrieveLastBlockNumber() (int64, error) {
 	panic("implement me")
 }
 
 // RetrieveFirstBlockNumber mock method
-func (mcr *MockCIDRetriever) RetrieveFirstBlockNumber() (int64, error) {
+func (mcr *CIDRetriever) RetrieveFirstBlockNumber() (int64, error) {
 	return mcr.FirstBlockNumberToReturn, mcr.RetrieveFirstBlockNumberErr
 }
 
 // RetrieveGapsInData mock method
-func (mcr *MockCIDRetriever) RetrieveGapsInData() ([]shared.Gap, error) {
+func (mcr *CIDRetriever) RetrieveGapsInData() ([]shared.Gap, error) {
 	mcr.CalledTimes++
 	return mcr.GapsToRetrieve, mcr.GapsToRetrieveErr
 }
 
 // SetGapsToRetrieve mock method
-func (mcr *MockCIDRetriever) SetGapsToRetrieve(gaps []shared.Gap) {
+func (mcr *CIDRetriever) SetGapsToRetrieve(gaps []shared.Gap) {
 	if mcr.GapsToRetrieve == nil {
 		mcr.GapsToRetrieve = make([]shared.Gap, 0)
 	}
 	mcr.GapsToRetrieve = append(mcr.GapsToRetrieve, gaps...)
 }
 
-func (mcr *MockCIDRetriever) Database() *postgres.DB {
+func (mcr *CIDRetriever) Database() *postgres.DB {
 	panic("implement me")
 }

pkg/super_node/shared/types.go

@@ -20,7 +20,7 @@ package shared
 type RawChainData interface{}
 
 // The concrete type underneath StreamedIPLDs should not be a pointer
-type StreamedIPLDs interface {
+type ConvertedData interface {
 	Height() int64
 }
 
@@ -28,10 +28,7 @@ type CIDsForIndexing interface{}
 
 type CIDsForFetching interface{}
 
-type FetchedIPLDs interface{}
-
-// The concrete type underneath StreamedIPLDs should not be a pointer
-type ServerResponse interface {
+type IPLDs interface {
 	Height() int64
 }