wrap generic top-level interfaces with loose types

cmd/streamEthSubscribe.go

@@ -65,7 +65,7 @@ func streamEthSubscription() {
 	str := streamer.NewSuperNodeStreamer(rpcClient)
 
 	// Buffered channel for reading subscription payloads
-	payloadChan := make(chan super_node.Payload, 20000)
+	payloadChan := make(chan super_node.SubscriptionPayload, 20000)
 
 	// Subscribe to the super node service with the given config/filter parameters
 	sub, err := str.Stream(payloadChan, ethSubConfig)
@@ -81,9 +81,9 @@ func streamEthSubscription() {
 				logWithCommand.Error(payload.Err)
 				continue
 			}
-			data, ok := payload.Data.(eth.StreamPayload)
+			data, ok := payload.Data.(eth.StreamResponse)
 			if !ok {
-				logWithCommand.Warnf("payload data expected type %T got %T", eth.StreamPayload{}, payload.Data)
+				logWithCommand.Warnf("payload data expected type %T got %T", eth.StreamResponse{}, payload.Data)
 				continue
 			}
 			for _, headerRlp := range data.HeadersRlp {

cmd/superNode.go

@@ -18,6 +18,8 @@ package cmd
 import (
 	"sync"
 
+	"github.com/vulcanize/vulcanizedb/pkg/super_node/shared"
+
 	"github.com/ethereum/go-ethereum/rpc"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -59,10 +61,10 @@ func superNode() {
 	}
 	wg := &sync.WaitGroup{}
 	var forwardQuitChan chan bool
-	var forwardPayloadChan chan interface{}
+	var forwardPayloadChan chan shared.StreamedIPLDs
 	if superNodeConfig.Serve {
 		forwardQuitChan = make(chan bool)
-		forwardPayloadChan = make(chan interface{}, super_node.PayloadChanBufferSize)
+		forwardPayloadChan = make(chan shared.StreamedIPLDs, super_node.PayloadChanBufferSize)
 		superNode.ScreenAndServe(wg, forwardPayloadChan, forwardQuitChan)
 		if err := startServers(superNode, superNodeConfig); err != nil {
 			logWithCommand.Fatal(err)