deep-stack/ipld-eth-server
4
0
Fork 0
forked from cerc-io/ipld-eth-server
Code Pull Requests Activity

VDB-207 refactor init move split toll tune flog (#110)

Browse Source 
* Use shared repo tests for vat_init

* Use shared methods in vat_init repository

* Use shared repo tests for vat_move

* Use shared methods in vat_move repository

* Use shared repo tests for vat_slip

* Use shared methods in vat_slip repository

* Use shared repo tests for vat_toll

* Use shared methods in vat_toll repository

* Use shared methods in vat_tune repository

* Use shared repo tests for vow_flog (+small namespace fix)

* Use shared methods in vow_flog repository

* Go vet + tiny oopsie
This commit is contained in:
Edvard Hübinette
2018-11-12 14:17:58 +01:00
committed by GitHub
parent 571f300392
commit 4f295b9aec
14 changed files with 241 additions and 1137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/transformers/vow_flog/converter_test.go
+2 -2
View File
@@ -49,10 +49,10 @@ var _ = Describe("Vow flog converter", func() {
})
It("converts a log to a model", func() {
models, err := converter.ToModels([]types.Log{test_data.EthFlogLog})
models, err := converter.ToModels([]types.Log{test_data.EthVowFlogLog})
Expect(err).NotTo(HaveOccurred())
Expect(len(models)).To(Equal(1))
Expect(models[0].(vow_flog.VowFlogModel)).To(Equal(test_data.FlogModel))
Expect(models[0].(vow_flog.VowFlogModel)).To(Equal(test_data.VowFlogModel))
})
})
pkg/transformers/vow_flog/repository.go
+6 -23
View File
@@ -18,6 +18,8 @@ import (
"fmt"
"github.com/vulcanize/vulcanizedb/pkg/core"
"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants"
)
type VowFlogRepository struct {
@@ -48,41 +50,22 @@ func (repository VowFlogRepository) Create(headerID int64, models []interface{})
return err
}
}
_, err = tx.Exec(`INSERT INTO public.checked_headers (header_id, vow_flog_checked)
VALUES ($1, $2)
ON CONFLICT (header_id) DO
UPDATE SET vow_flog_checked = $2`, headerID, true)
err = shared.MarkHeaderCheckedInTransaction(headerID, tx, constants.VowFlogChecked)
if err != nil {
tx.Rollback()
return err
}
return tx.Commit()
}
func (repository VowFlogRepository) MarkHeaderChecked(headerID int64) error {
_, err := repository.db.Exec(`INSERT INTO public.checked_headers (header_id, vow_flog_checked)
VALUES ($1, $2)
ON CONFLICT (header_id) DO
UPDATE SET vow_flog_checked = $2`, headerID, true)
return err
return shared.MarkHeaderChecked(headerID, repository.db, constants.VowFlogChecked)
}
func (repository VowFlogRepository) MissingHeaders(startingBlockNumber, endingBlockNumber int64) ([]core.Header, error) {
var result []core.Header
err := repository.db.Select(
&result,
`SELECT headers.id, headers.block_number FROM headers
LEFT JOIN checked_headers on headers.id = header_id
WHERE (header_id ISNULL OR vow_flog_checked IS FALSE)
AND headers.block_number >= $1
AND headers.block_number <= $2
AND headers.eth_node_fingerprint = $3`,
startingBlockNumber,
endingBlockNumber,
repository.db.Node.ID,
)
return result, err
return shared.MissingHeaders(startingBlockNumber, endingBlockNumber, repository.db, constants.VowFlogChecked)
}
func (repository *VowFlogRepository) SetDB(db *postgres.DB) {
pkg/transformers/vow_flog/repository_test.go
+36 -162
View File
@@ -15,14 +15,11 @@
package vow_flog_test
import (
"database/sql"
"math/rand"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants"
"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data/shared_behaviors"
"github.com/vulcanize/vulcanizedb/pkg/core"
"github.com/vulcanize/vulcanizedb/pkg/datastore"
"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres"
"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories"
"github.com/vulcanize/vulcanizedb/pkg/fakes"
@@ -33,186 +30,63 @@ import (
var _ = Describe("Vow flog repository", func() {
var (
db *postgres.DB
flogRepository vow_flog.VowFlogRepository
err error
headerRepository datastore.HeaderRepository
db *postgres.DB
repository vow_flog.VowFlogRepository
)
BeforeEach(func() {
db = test_config.NewTestDB(core.Node{})
db = test_config.NewTestDB(test_config.NewTestNode())
test_config.CleanTestDB(db)
headerRepository = repositories.NewHeaderRepository(db)
flogRepository = vow_flog.VowFlogRepository{}
flogRepository.SetDB(db)
repository = vow_flog.VowFlogRepository{}
repository.SetDB(db)
})
Describe("Create", func() {
var headerID int64
modelWithDifferentLogIdx := test_data.VowFlogModel
modelWithDifferentLogIdx.LogIndex++
inputs := shared_behaviors.CreateBehaviorInputs{
CheckedHeaderColumnName: constants.VowFlogChecked,
LogEventTableName: "maker.vow_flog",
TestModel: test_data.VowFlogModel,
ModelWithDifferentLogIdx: modelWithDifferentLogIdx,
Repository: &repository,
}
BeforeEach(func() {
headerID, err = headerRepository.CreateOrUpdateHeader(fakes.FakeHeader)
Expect(err).NotTo(HaveOccurred())
})
shared_behaviors.SharedRepositoryCreateBehaviors(&inputs)
It("adds a vow flog event", func() {
err = flogRepository.Create(headerID, []interface{}{test_data.FlogModel})
headerRepository := repositories.NewHeaderRepository(db)
headerID, err := headerRepository.CreateOrUpdateHeader(fakes.FakeHeader)
Expect(err).NotTo(HaveOccurred())
err = repository.Create(headerID, []interface{}{test_data.VowFlogModel})
Expect(err).NotTo(HaveOccurred())
var dbFlog vow_flog.VowFlogModel
err = db.Get(&dbFlog, `SELECT era, log_idx, tx_idx, raw_log FROM maker.vow_flog WHERE header_id = $1`, headerID)
Expect(err).NotTo(HaveOccurred())
Expect(dbFlog.Era).To(Equal(test_data.FlogModel.Era))
Expect(dbFlog.LogIndex).To(Equal(test_data.FlogModel.LogIndex))
Expect(dbFlog.TransactionIndex).To(Equal(test_data.FlogModel.TransactionIndex))
Expect(dbFlog.Raw).To(MatchJSON(test_data.FlogModel.Raw))
})
It("marks header as checked for logs", func() {
err = flogRepository.Create(headerID, []interface{}{test_data.FlogModel})
Expect(err).NotTo(HaveOccurred())
var headerChecked bool
err = db.Get(&headerChecked, `SELECT vow_flog_checked FROM public.checked_headers WHERE header_id = $1`, headerID)
Expect(err).NotTo(HaveOccurred())
Expect(headerChecked).To(BeTrue())
})
It("updates the header to checked if checked headers row already exists", func() {
_, err = db.Exec(`INSERT INTO public.checked_headers (header_id) VALUES ($1)`, headerID)
Expect(err).NotTo(HaveOccurred())
err = flogRepository.Create(headerID, []interface{}{test_data.FlogModel})
Expect(err).NotTo(HaveOccurred())
var headerChecked bool
err = db.Get(&headerChecked, `SELECT vow_flog_checked FROM public.checked_headers WHERE header_id = $1`, headerID)
Expect(err).NotTo(HaveOccurred())
Expect(headerChecked).To(BeTrue())
})
It("does not duplicate vow flog events", func() {
err = flogRepository.Create(headerID, []interface{}{test_data.FlogModel})
Expect(err).NotTo(HaveOccurred())
err = flogRepository.Create(headerID, []interface{}{test_data.FlogModel})
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("pq: duplicate key value violates unique constraint"))
})
It("removes vow flog events if corresponding header is deleted", func() {
_, err = db.Exec(`DELETE FROM headers WHERE id = $1`, headerID)
Expect(err).NotTo(HaveOccurred())
var dbFlog vow_flog.VowFlogModel
err = db.Get(&dbFlog, `SELECT era, log_idx, tx_idx, raw_log FROM maker.vow_flog WHERE header_id = $1`, headerID)
Expect(err).To(HaveOccurred())
Expect(err).To(MatchError(sql.ErrNoRows))
})
It("returns an error if model is of wrong type", func() {
err = flogRepository.Create(headerID, []interface{}{test_data.WrongModel{}})
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("model of type"))
Expect(dbFlog.Era).To(Equal(test_data.VowFlogModel.Era))
Expect(dbFlog.LogIndex).To(Equal(test_data.VowFlogModel.LogIndex))
Expect(dbFlog.TransactionIndex).To(Equal(test_data.VowFlogModel.TransactionIndex))
Expect(dbFlog.Raw).To(MatchJSON(test_data.VowFlogModel.Raw))
})
})
Describe("MarkHeaderChecked", func() {
var headerID int64
inputs := shared_behaviors.MarkedHeaderCheckedBehaviorInputs{
CheckedHeaderColumnName: constants.VowFlogChecked,
Repository: &repository,
}
BeforeEach(func() {
headerID, err = headerRepository.CreateOrUpdateHeader(fakes.FakeHeader)
Expect(err).NotTo(HaveOccurred())
})
It("creates a row for a new headerID", func() {
err = flogRepository.MarkHeaderChecked(headerID)
Expect(err).NotTo(HaveOccurred())
var headerChecked bool
err = db.Get(&headerChecked, `SELECT vow_flog_checked FROM public.checked_headers WHERE header_id = $1`, headerID)
Expect(err).NotTo(HaveOccurred())
Expect(headerChecked).To(BeTrue())
})
It("updates row when headerID already exists", func() {
_, err = db.Exec(`INSERT INTO public.checked_headers (header_id) VALUES ($1)`, headerID)
err = flogRepository.MarkHeaderChecked(headerID)
Expect(err).NotTo(HaveOccurred())
var headerChecked bool
err = db.Get(&headerChecked, `SELECT vow_flog_checked FROM public.checked_headers WHERE header_id = $1`, headerID)
Expect(err).NotTo(HaveOccurred())
Expect(headerChecked).To(BeTrue())
})
shared_behaviors.SharedRepositoryMarkHeaderCheckedBehaviors(&inputs)
})
Describe("MissingHeaders", func() {
var (
startingBlockNumber, flogBlockNumber, endingBlockNumber int64
blockNumbers, headerIDs []int64
)
inputs := shared_behaviors.MissingHeadersBehaviorInputs{
Repository: &repository,
RepositoryTwo: &vow_flog.VowFlogRepository{},
}
BeforeEach(func() {
startingBlockNumber = rand.Int63()
flogBlockNumber = startingBlockNumber + 1
endingBlockNumber = startingBlockNumber + 2
blockNumbers = []int64{startingBlockNumber, flogBlockNumber, endingBlockNumber, endingBlockNumber + 1}
headerIDs = []int64{}
for _, n := range blockNumbers {
headerID, err := headerRepository.CreateOrUpdateHeader(fakes.GetFakeHeader(n))
Expect(err).NotTo(HaveOccurred())
headerIDs = append(headerIDs, headerID)
}
})
It("returns headers that haven't been checked", func() {
err := flogRepository.MarkHeaderChecked(headerIDs[1])
Expect(err).NotTo(HaveOccurred())
headers, err := flogRepository.MissingHeaders(startingBlockNumber, endingBlockNumber)
Expect(err).NotTo(HaveOccurred())
Expect(len(headers)).To(Equal(2))
Expect(headers[0].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber)))
Expect(headers[1].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber)))
})
It("only treats headers as checked if vow flog logs have been checked", func() {
_, err := db.Exec(`INSERT INTO public.checked_headers (header_id) VALUES ($1)`, headerIDs[1])
Expect(err).NotTo(HaveOccurred())
headers, err := flogRepository.MissingHeaders(startingBlockNumber, endingBlockNumber)
Expect(err).NotTo(HaveOccurred())
Expect(len(headers)).To(Equal(3))
Expect(headers[0].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber), Equal(flogBlockNumber)))
Expect(headers[1].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber), Equal(flogBlockNumber)))
Expect(headers[2].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber), Equal(flogBlockNumber)))
})
It("only returns headers associated with the current node", func() {
dbTwo := test_config.NewTestDB(core.Node{ID: "second"})
headerRepositoryTwo := repositories.NewHeaderRepository(dbTwo)
for _, n := range blockNumbers {
_, err = headerRepositoryTwo.CreateOrUpdateHeader(fakes.GetFakeHeader(n))
Expect(err).NotTo(HaveOccurred())
}
flogRepositoryTwo := vow_flog.VowFlogRepository{}
flogRepositoryTwo.SetDB(dbTwo)
err := flogRepository.MarkHeaderChecked(headerIDs[0])
Expect(err).NotTo(HaveOccurred())
nodeOneMissingHeaders, err := flogRepository.MissingHeaders(blockNumbers[0], blockNumbers[len(blockNumbers)-1])
Expect(err).NotTo(HaveOccurred())
Expect(len(nodeOneMissingHeaders)).To(Equal(len(blockNumbers) - 1))
nodeTwoMissingHeaders, err := flogRepositoryTwo.MissingHeaders(blockNumbers[0], blockNumbers[len(blockNumbers)-1])
Expect(err).NotTo(HaveOccurred())
Expect(len(nodeTwoMissingHeaders)).To(Equal(len(blockNumbers)))
})
shared_behaviors.SharedRepositoryMissingHeadersBehaviors(&inputs)
})
})