Refactor config to return an error instead of aborting

This commit is contained in:
Eric Meyer
2017-11-09 12:41:02 -06:00
parent 61cf7af2ec
commit aa52088ba7
8 changed files with 60 additions and 24 deletions
+1
View File
@@ -6,6 +6,7 @@ import (
"context"
"errors"
"github.com/8thlight/vulcanizedb/pkg/core"
"github.com/jmoiron/sqlx"
_ "github.com/lib/pq"
+8 -4
View File
@@ -217,7 +217,8 @@ var _ = Describe("Repositories", func() {
Describe("Postgres repository", func() {
It("connects to the database", func() {
pgConfig := config.DbConnectionString(config.NewConfig("private").Database)
cfg, _ := config.NewConfig("private")
pgConfig := config.DbConnectionString(cfg.Database)
db, err := sqlx.Connect("postgres", pgConfig)
Expect(err).Should(BeNil())
Expect(db).ShouldNot(BeNil())
@@ -232,7 +233,8 @@ var _ = Describe("Repositories", func() {
Nonce: badNonce,
Transactions: []core.Transaction{},
}
pgConfig := config.DbConnectionString(config.NewConfig("private").Database)
cfg, _ := config.NewConfig("private")
pgConfig := config.DbConnectionString(cfg.Database)
db, _ := sqlx.Connect("postgres", pgConfig)
Expect(db).ShouldNot(BeNil())
repository := repositories.NewPostgres(db)
@@ -249,7 +251,8 @@ var _ = Describe("Repositories", func() {
//badHash violates db To field length
badHash := fmt.Sprintf("x %s", strings.Repeat("1", 100))
badTransaction := core.Transaction{To: badHash}
pgConfig := config.DbConnectionString(config.NewConfig("private").Database)
cfg, _ := config.NewConfig("private")
pgConfig := config.DbConnectionString(cfg.Database)
block := core.Block{
Number: 123,
Transactions: []core.Transaction{badTransaction},
@@ -266,7 +269,8 @@ var _ = Describe("Repositories", func() {
})
AssertRepositoryBehavior(func() repositories.Repository {
pgConfig := config.DbConnectionString(config.NewConfig("private").Database)
cfg, _ := config.NewConfig("private")
pgConfig := config.DbConnectionString(cfg.Database)
db, _ := sqlx.Connect("postgres", pgConfig)
db.MustExec("DELETE FROM transactions")
db.MustExec("DELETE FROM blocks")