api test; return full ipld models to subscribers

pkg/super_node/shared/config.go

@@ -23,14 +23,11 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcd/rpcclient"
-	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/spf13/viper"
 
 	"github.com/vulcanize/vulcanizedb/pkg/config"
-	"github.com/vulcanize/vulcanizedb/pkg/eth"
 	"github.com/vulcanize/vulcanizedb/pkg/eth/client"
-	vRpc "github.com/vulcanize/vulcanizedb/pkg/eth/converters/rpc"
 	"github.com/vulcanize/vulcanizedb/pkg/eth/core"
 	"github.com/vulcanize/vulcanizedb/pkg/eth/node"
 	"github.com/vulcanize/vulcanizedb/pkg/postgres"
@@ -191,10 +188,6 @@ func getEthNodeAndClient(path string) (core.Node, interface{}, error) {
 		return core.Node{}, nil, err
 	}
 	rpcClient := client.NewRPCClient(rawRPCClient, path)
-	ethClient := ethclient.NewClient(rawRPCClient)
-	vdbEthClient := client.NewEthClient(ethClient)
 	vdbNode := node.MakeNode(rpcClient)
-	transactionConverter := vRpc.NewRPCTransactionConverter(ethClient)
-	blockChain := eth.NewBlockChain(vdbEthClient, rpcClient, vdbNode, transactionConverter)
-	return blockChain.Node(), rpcClient, nil
+	return vdbNode, rpcClient, nil
 }

pkg/super_node/shared/functions.go

@@ -18,6 +18,8 @@ package shared
 
 import (
 	"bytes"
+
+	"github.com/vulcanize/vulcanizedb/pkg/ipfs"
 )
 
 // ListContainsString used to check if a list of strings contains a particular string
@@ -30,10 +32,10 @@ func ListContainsString(sss []string, s string) bool {
 	return false
 }
 
-// ListContainsBytes used to check if a list of byte arrays contains a particular byte array
-func ListContainsBytes(bbb [][]byte, b []byte) bool {
-	for _, by := range bbb {
-		if bytes.Equal(by, b) {
+// IPLDsContainBytes used to check if a list of strings contains a particular string
+func IPLDsContainBytes(iplds []ipfs.BlockModel, b []byte) bool {
+	for _, ipld := range iplds {
+		if bytes.Equal(ipld.Data, b) {
 			return true
 		}
 	}