fixes after tests

libraries/shared/mocks/batch_client.go

@@ -21,6 +21,8 @@ import (
 	"encoding/json"
 	"errors"
 
+	"github.com/ethereum/go-ethereum/rpc"
+
 	"github.com/ethereum/go-ethereum/statediff"
 	"github.com/vulcanize/vulcanizedb/pkg/eth/client"
 )
@@ -65,7 +67,7 @@ func (mc *BackFillerClient) BatchCall(batch []client.BatchElem) error {
 }
 
 // BatchCallContext mockClient method to simulate batch call to geth
-func (mc *BackFillerClient) BatchCallContext(ctx context.Context, batch []client.BatchElem) error {
+func (mc *BackFillerClient) BatchCallContext(ctx context.Context, batch []rpc.BatchElem) error {
 	if mc.MappedStateDiffAt == nil {
 		return errors.New("mockclient needs to be initialized with statediff payloads and errors")
 	}

libraries/shared/mocks/stream_client.go

@@ -0,0 +1,44 @@
+// VulcanizeDB
+// Copyright © 2019 Vulcanize
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package mocks
+
+import (
+	"context"
+
+	"github.com/ethereum/go-ethereum/rpc"
+)
+
+type StreamClient struct {
+	passedContext       context.Context
+	passedResult        interface{}
+	passedNamespace     string
+	passedPayloadChan   interface{}
+	passedSubscribeArgs []interface{}
+}
+
+func (client *StreamClient) Subscribe(ctx context.Context, namespace string, payloadChan interface{}, args ...interface{}) (*rpc.ClientSubscription, error) {
+	client.passedNamespace = namespace
+	client.passedPayloadChan = payloadChan
+	client.passedContext = ctx
+
+	for _, arg := range args {
+		client.passedSubscribeArgs = append(client.passedSubscribeArgs, arg)
+	}
+
+	subscription := rpc.ClientSubscription{}
+	return &subscription, nil
+}

libraries/shared/storage/utils/bins.go

@@ -16,7 +16,11 @@
 
 package utils
 
-import "errors"
+import (
+	"errors"
+
+	"github.com/vulcanize/vulcanizedb/pkg/super_node/shared"
+)
 
 func GetBlockHeightBins(startingBlock, endingBlock, batchSize uint64) ([][]uint64, error) {
 	if endingBlock < startingBlock {
@@ -43,3 +47,26 @@ func GetBlockHeightBins(startingBlock, endingBlock, batchSize uint64) ([][]uint6
 	}
 	return blockRangeBins, nil
 }
+
+func MissingHeightsToGaps(heights []uint64) []shared.Gap {
+	validationGaps := make([]shared.Gap, 0)
+	start := heights[0]
+	lastHeight := start
+	for i, height := range heights[1:] {
+		if height != lastHeight+1 {
+			validationGaps = append(validationGaps, shared.Gap{
+				Start: start,
+				Stop:  lastHeight,
+			})
+			start = height
+		}
+		if i+2 == len(heights) {
+			validationGaps = append(validationGaps, shared.Gap{
+				Start: start,
+				Stop:  height,
+			})
+		}
+		lastHeight = height
+	}
+	return validationGaps
+}