Privatise DB repository field and add transformer test

This commit is contained in:
Edvard
2018-10-23 10:47:01 +02:00
parent cb74cbe990
commit 7ee3329baf
37 changed files with 182 additions and 138 deletions
+6 -6
View File
@@ -22,11 +22,11 @@ import (
)
type VatInitRepository struct {
DB *postgres.DB
db *postgres.DB
}
func (repository VatInitRepository) Create(headerID int64, models []interface{}) error {
tx, err := repository.DB.Begin()
tx, err := repository.db.Begin()
if err != nil {
return err
}
@@ -64,7 +64,7 @@ func (repository VatInitRepository) Create(headerID int64, models []interface{})
}
func (repository VatInitRepository) MarkHeaderChecked(headerID int64) error {
_, err := repository.DB.Exec(`INSERT INTO public.checked_headers (header_id, vat_init_checked)
_, err := repository.db.Exec(`INSERT INTO public.checked_headers (header_id, vat_init_checked)
VALUES ($1, $2)
ON CONFLICT (header_id) DO
UPDATE SET vat_init_checked = $2`, headerID, true)
@@ -73,7 +73,7 @@ func (repository VatInitRepository) MarkHeaderChecked(headerID int64) error {
func (repository VatInitRepository) MissingHeaders(startingBlockNumber, endingBlockNumber int64) ([]core.Header, error) {
var result []core.Header
err := repository.DB.Select(
err := repository.db.Select(
&result,
`SELECT headers.id, headers.block_number FROM headers
LEFT JOIN checked_headers on headers.id = header_id
@@ -83,11 +83,11 @@ func (repository VatInitRepository) MissingHeaders(startingBlockNumber, endingBl
AND headers.eth_node_fingerprint = $3`,
startingBlockNumber,
endingBlockNumber,
repository.DB.Node.ID,
repository.db.Node.ID,
)
return result, err
}
func (repository *VatInitRepository) SetDB(db *postgres.DB) {
repository.DB = db
repository.db = db
}
+4 -11
View File
@@ -40,7 +40,8 @@ var _ = Describe("Vat init repository", func() {
BeforeEach(func() {
db = test_config.NewTestDB(core.Node{})
test_config.CleanTestDB(db)
vatInitRepository = vat_init.VatInitRepository{DB: db}
vatInitRepository = vat_init.VatInitRepository{}
vatInitRepository.SetDB(db)
headerRepository = repositories.NewHeaderRepository(db)
})
@@ -180,7 +181,8 @@ var _ = Describe("Vat init repository", func() {
Expect(err).NotTo(HaveOccurred())
}
vatInitRepositoryTwo := vat_init.VatInitRepository{DB: dbTwo}
vatInitRepositoryTwo := vat_init.VatInitRepository{}
vatInitRepositoryTwo.SetDB(dbTwo)
err = vatInitRepository.MarkHeaderChecked(headerIDs[0])
Expect(err).NotTo(HaveOccurred())
@@ -193,13 +195,4 @@ var _ = Describe("Vat init repository", func() {
Expect(len(nodeTwoMissingHeaders)).To(Equal(len(blockNumbers)))
})
})
Describe("SetDB", func() {
It("sets the repository db", func() {
vatInitRepository.SetDB(nil)
Expect(vatInitRepository.DB).To(BeNil())
vatInitRepository.SetDB(db)
Expect(vatInitRepository.DB).To(Equal(db))
})
})
})
@@ -55,6 +55,11 @@ var _ = Describe("Vat init transformer", func() {
}.NewTransformer(nil, nil)
})
It("sets the blockchain and database", func() {
Expect(fetcher.SetBcCalled).To(BeTrue())
Expect(repository.SetDbCalled).To(BeTrue())
})
It("gets missing headers for block numbers specified in config", func() {
err := transformer.Execute()