change omniwatcher database test helpers so that it doesn't interfere with downstream maker tests

cmd/lightSync.go

@@ -37,24 +37,16 @@ var lightSyncCmd = &cobra.Command{
 	Short: "Syncs VulcanizeDB with local ethereum node's block headers",
 	Long: `Syncs VulcanizeDB with local ethereum node. Populates
 Postgres with block headers.
-<<<<<<< HEAD
 
 ./vulcanizedb lightSync --starting-block-number 0 --config public.toml
 
 Expects ethereum node to be running and requires a .toml config:
 
-=======
-./vulcanizedb lightSync --starting-block-number 0 --config public.toml
-Expects ethereum node to be running and requires a .toml config:
->>>>>>> origin/master
   [database]
   name = "vulcanize_public"
   hostname = "localhost"
   port = 5432
-<<<<<<< HEAD
 
-=======
->>>>>>> origin/master
   [client]
   ipcPath = "/Users/user/Library/Ethereum/geth.ipc"
 `,

cmd/root.go

@@ -20,12 +20,12 @@ import (
 	"os"
 	"time"
 
+	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/mitchellh/go-homedir"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/ethereum/go-ethereum/ethclient"
 
 	"github.com/vulcanize/vulcanizedb/pkg/config"
 	"github.com/vulcanize/vulcanizedb/pkg/geth"
@@ -131,4 +131,3 @@ func getBlockChain() *geth.BlockChain {
 	transactionConverter := vRpc.NewRpcTransactionConverter(ethClient)
 	return geth.NewBlockChain(vdbEthClient, rpcClient, vdbNode, transactionConverter)
 }
-