minor refactoring

pkg/eth/transformer.go

@@ -18,7 +18,6 @@ package eth
 
 import (
 	"fmt"
-	sdtypes "github.com/ethereum/go-ethereum/statediff/types"
 	"math/big"
 	"time"
 
@@ -29,6 +28,7 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/ethereum/go-ethereum/statediff"
+	sdtypes "github.com/ethereum/go-ethereum/statediff/types"
 	node "github.com/ipfs/go-ipld-format"
 	"github.com/jmoiron/sqlx"
 	"github.com/multiformats/go-multihash"

pkg/eth/types.go

@@ -17,11 +17,11 @@
 package eth
 
 import (
-	sdtypes "github.com/ethereum/go-ethereum/statediff/types"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
+	sdtypes "github.com/ethereum/go-ethereum/statediff/types"
 )
 
 // ConvertedPayload is a custom type which packages raw ETH data for publishing to IPFS and filtering to subscribers

pkg/historical/config.go

@@ -44,8 +44,6 @@ const (
 
 // Config struct
 type Config struct {
-	DBConfig postgres.Config
-
 	DB              *postgres.DB
 	HTTPClient      *rpc.Client
 	Frequency       time.Duration
@@ -92,9 +90,9 @@ func NewConfig() (*Config, error) {
 		return nil, err
 	}
 
-	c.DBConfig.Init()
-	overrideDBConnConfig(&c.DBConfig)
-	db := utils.LoadPostgres(c.DBConfig, c.NodeInfo, true)
+	dbConfig := postgres.NewConfig()
+	overrideDBConnConfig(dbConfig)
+	db := utils.LoadPostgres(dbConfig, c.NodeInfo, true)
 	c.DB = &db
 	return c, nil
 }

pkg/postgres/config.go

@@ -45,7 +45,7 @@ type Config struct {
 	MaxLifetime int
 }
 
-func DbConnectionString(config Config) string {
+func (config *Config) DbConnectionString() string {
 	if len(config.User) > 0 && len(config.Password) > 0 {
 		return fmt.Sprintf("postgresql://%s:%s@%s:%d/%s?sslmode=disable",
 			config.User, config.Password, config.Hostname, config.Port, config.Name)
@@ -57,7 +57,9 @@ func DbConnectionString(config Config) string {
 	return fmt.Sprintf("postgresql://%s:%d/%s?sslmode=disable", config.Hostname, config.Port, config.Name)
 }
 
-func (d *Config) Init() {
+// NewConfig initializes and returns a new db config
+func NewConfig() *Config {
+	config := new(Config)
 	viper.BindEnv("database.name", DATABASE_NAME)
 	viper.BindEnv("database.hostname", DATABASE_HOSTNAME)
 	viper.BindEnv("database.port", DATABASE_PORT)
@@ -67,12 +69,13 @@ func (d *Config) Init() {
 	viper.BindEnv("database.maxOpen", DATABASE_MAX_OPEN_CONNECTIONS)
 	viper.BindEnv("database.maxLifetime", DATABASE_MAX_CONN_LIFETIME)
 
-	d.Name = viper.GetString("database.name")
-	d.Hostname = viper.GetString("database.hostname")
-	d.Port = viper.GetInt("database.port")
-	d.User = viper.GetString("database.user")
-	d.Password = viper.GetString("database.password")
-	d.MaxIdle = viper.GetInt("database.maxIdle")
-	d.MaxOpen = viper.GetInt("database.maxOpen")
-	d.MaxLifetime = viper.GetInt("database.maxLifetime")
+	config.Name = viper.GetString("database.name")
+	config.Hostname = viper.GetString("database.hostname")
+	config.Port = viper.GetInt("database.port")
+	config.User = viper.GetString("database.user")
+	config.Password = viper.GetString("database.password")
+	config.MaxIdle = viper.GetInt("database.maxIdle")
+	config.MaxOpen = viper.GetInt("database.maxOpen")
+	config.MaxLifetime = viper.GetInt("database.maxLifetime")
+	return config
 }

pkg/postgres/postgres.go

@@ -29,10 +29,11 @@ type DB struct {
 	*sqlx.DB
 	Node   node.Info
 	NodeID int64
+	Config *Config
 }
 
-func NewDB(databaseConfig Config, node node.Info, createNode bool) (*DB, error) {
-	connectString := DbConnectionString(databaseConfig)
+func NewDB(databaseConfig *Config, node node.Info, createNode bool) (*DB, error) {
+	connectString := databaseConfig.DbConnectionString()
 	db, connectErr := sqlx.Connect("postgres", connectString)
 	if connectErr != nil {
 		return &DB{}, ErrDBConnectionFailed(connectErr)
@@ -48,7 +49,7 @@ func NewDB(databaseConfig Config, node node.Info, createNode bool) (*DB, error)
 		lifetime := time.Duration(databaseConfig.MaxLifetime) * time.Second
 		db.SetConnMaxLifetime(lifetime)
 	}
-	pg := DB{DB: db, Node: node}
+	pg := DB{DB: db, Node: node, Config: databaseConfig}
 
 	if createNode {
 		nodeErr := pg.CreateNode(&node)

pkg/postgres/postgres_test.go

@@ -18,9 +18,10 @@ package postgres_test
 
 import (
 	"fmt"
-	"github.com/vulcanize/ipld-eth-indexer/pkg/shared"
 	"strings"
 
+	"github.com/vulcanize/ipld-eth-indexer/pkg/shared"
+
 	"math/big"
 
 	_ "github.com/lib/pq"

pkg/resync/config.go

@@ -52,8 +52,7 @@ type Config struct {
 	ResetValidation bool            // If true, resync will reset the validation level to 0 for the given range
 
 	// DB info
-	DB       *postgres.DB
-	DBConfig postgres.Config
+	DB *postgres.DB
 
 	HTTPClient *rpc.Client   // Ethereum rpc client
 	NodeInfo   node.Info     // Info for the associated node
@@ -110,9 +109,9 @@ func NewConfig() (*Config, error) {
 		return nil, err
 	}
 
-	c.DBConfig.Init()
-	overrideDBConnConfig(&c.DBConfig)
-	db := utils.LoadPostgres(c.DBConfig, c.NodeInfo, true)
+	dbConfig := postgres.NewConfig()
+	overrideDBConnConfig(dbConfig)
+	db := utils.LoadPostgres(dbConfig, c.NodeInfo, true)
 	c.DB = &db
 	return c, nil
 }

pkg/shared/test_helpers.go

@@ -17,13 +17,13 @@
 package shared
 
 import (
-	"github.com/ipfs/go-cid"
-	"github.com/multiformats/go-multihash"
-	"github.com/vulcanize/ipld-eth-indexer/pkg/postgres"
 	"os"
 	"strconv"
 
+	"github.com/ipfs/go-cid"
+	"github.com/multiformats/go-multihash"
 	"github.com/vulcanize/ipld-eth-indexer/pkg/node"
+	"github.com/vulcanize/ipld-eth-indexer/pkg/postgres"
 )
 
 // SetupDB is use to setup a db for watcher tests
@@ -35,7 +35,7 @@ func SetupDBWithNode(node node.Info) (*postgres.DB, error) {
 	return postgres.NewDB(getTestConfig(), node, true)
 }
 
-func getTestConfig() postgres.Config {
+func getTestConfig() *postgres.Config {
 	// get connection to test database from environment variables
 	hostname := os.Getenv(postgres.DATABASE_HOSTNAME)
 	if hostname == "" {
@@ -56,7 +56,7 @@ func getTestConfig() postgres.Config {
 	user := os.Getenv(postgres.DATABASE_USER)
 	password := os.Getenv(postgres.DATABASE_PASSWORD)
 
-	return postgres.Config{
+	return &postgres.Config{
 		Hostname: hostname,
 		Name:     name,
 		Port:     port,

pkg/sync/config.go

@@ -40,7 +40,6 @@ const (
 // Config struct
 type Config struct {
 	DB       *postgres.DB
-	DBConfig postgres.Config
 	Workers  int64
 	WSClient *rpc.Client
 	NodeInfo node.Info
@@ -65,9 +64,9 @@ func NewConfig() (*Config, error) {
 		return nil, err
 	}
 
-	c.DBConfig.Init()
-	overrideDBConnConfig(&c.DBConfig)
-	syncDB := utils.LoadPostgres(c.DBConfig, c.NodeInfo, true)
+	dbConfig := postgres.NewConfig()
+	overrideDBConnConfig(dbConfig)
+	syncDB := utils.LoadPostgres(dbConfig, c.NodeInfo, true)
 	c.DB = &syncDB
 	return c, nil
 }

utils/utils.go

@@ -25,7 +25,7 @@ import (
 	"github.com/vulcanize/ipld-eth-indexer/pkg/postgres"
 )
 
-func LoadPostgres(database postgres.Config, node node.Info, createNode bool) postgres.DB {
+func LoadPostgres(database *postgres.Config, node node.Info, createNode bool) postgres.DB {
 	db, err := postgres.NewDB(database, node, createNode)
 	if err != nil {
 		logrus.Fatal("Error loading postgres: ", err)