update vendor dep; constrain to revision of geth with UnpackIntoMap; updates to match

pkg/datastore/ethereum/database.go

@@ -18,11 +18,10 @@ package ethereum
 
 import (
 	"fmt"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/sirupsen/logrus"
 
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-
 	"github.com/vulcanize/vulcanizedb/pkg/datastore/ethereum/level"
 )
 
@@ -36,7 +35,7 @@ type Database interface {
 func CreateDatabase(config DatabaseConfig) (Database, error) {
 	switch config.Type {
 	case Level:
-		levelDBConnection, err := ethdb.NewLDBDatabase(config.Path, 128, 1024)
+		levelDBConnection, err := rawdb.NewLevelDBDatabase(config.Path, 128, 1024, "vdb")
 		if err != nil {
 			logrus.Error("CreateDatabase: error connecting to new LDBD: ", err)
 			return nil, err

pkg/datastore/ethereum/level/database_reader.go

@@ -20,6 +20,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethdb"
 )
 
 type Reader interface {
@@ -31,10 +32,10 @@ type Reader interface {
 }
 
 type LevelDatabaseReader struct {
-	reader rawdb.DatabaseReader
+	reader ethdb.Reader
 }
 
-func NewLevelDatabaseReader(reader rawdb.DatabaseReader) *LevelDatabaseReader {
+func NewLevelDatabaseReader(reader ethdb.Reader) *LevelDatabaseReader {
 	return &LevelDatabaseReader{reader: reader}
 }