Use vdb InsertionModel in cat_file_flip repository

vulcanize · Oct 31, 2019 · 67e2a51 · 67e2a51
1 parent 00fed7e
commit 67e2a51
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 30 deletions.
diff --git a/test_config/test_config.go b/test_config/test_config.go
@@ -65,7 +65,7 @@ func setTestConfig() {
 
 func setABIPath() {
 	gp := os.Getenv("GOPATH")
-	ABIFilePath = gp + "/src/github.com/vulcanize/vulcanizedb/pkg/geth/testing/"
+	ABIFilePath = gp + "/src/github.com/vulcanize/vulcanizedb/pkg/eth/testing/"
 }
 
 func NewTestDB(node core.Node) *postgres.DB {

diff --git a/transformers/component_tests/queries/all_ilk_file_events_query_test.go b/transformers/component_tests/queries/all_ilk_file_events_query_test.go
@@ -17,6 +17,7 @@
 package queries
 
 import (
+	"github.com/vulcanize/vulcanizedb/libraries/shared/factories/event"
 	"math/rand"
 	"strconv"
 
@@ -43,7 +44,7 @@ import (
 var _ = Describe("Ilk File Events Query", func() {
 	var (
 		catFileChopLumpRepo   chop_lump.CatFileChopLumpRepository
-		catFileFlipRepo       flip.CatFileFlipRepository
+		catFileFlipRepo       flip.Repository
 		db                    *postgres.DB
 		err                   error
 		headerOneId, logOneId int64
@@ -60,7 +61,7 @@ var _ = Describe("Ilk File Events Query", func() {
 		test_config.CleanTestDB(db)
 		catFileChopLumpRepo = chop_lump.CatFileChopLumpRepository{}
 		catFileChopLumpRepo.SetDB(db)
-		catFileFlipRepo = flip.CatFileFlipRepository{}
+		catFileFlipRepo = flip.Repository{}
 		catFileFlipRepo.SetDB(db)
 		headerRepo = repositories.NewHeaderRepository(db)
 		headerOne := fakes.GetFakeHeader(1)
@@ -88,10 +89,12 @@ var _ = Describe("Ilk File Events Query", func() {
 
 		catFileFlipLog := test_data.CreateTestLog(headerOneId, db)
 		catFileFlip := test_data.CatFileFlipModel()
-		catFileFlip.ForeignKeyValues[constants.IlkFK] = test_helpers.FakeIlk.Hex
+		ilkId, createIlkError := shared.GetOrCreateIlk(test_helpers.FakeIlk.Hex, db)
+		Expect(createIlkError).NotTo(HaveOccurred())
+		catFileFlip.ColumnValues[constants.IlkColumn] = ilkId
 		catFileFlip.ColumnValues[constants.HeaderFK] = headerOneId
 		catFileFlip.ColumnValues[constants.LogFK] = catFileFlipLog.ID
-		flipErr := catFileFlipRepo.Create([]shared.InsertionModel{catFileFlip})
+		flipErr := catFileFlipRepo.Create([]event.InsertionModel{catFileFlip})
 		Expect(flipErr).NotTo(HaveOccurred())
 
 		jugFileLog := test_data.CreateTestLog(headerOneId, db)

diff --git a/transformers/events/cat_file/flip/converter.go b/transformers/events/cat_file/flip/converter.go
@@ -25,7 +25,7 @@ import (
 	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres"
 )
 
-type Converter struct{
+type Converter struct {
 	db *postgres.DB
 }
 
@@ -34,10 +34,10 @@ func (converter *Converter) SetDB(db *postgres.DB) {
 }
 
 const (
-	logDataRequired   = true
-	numTopicsRequired = 4
-	What event.ColumnName = "what"
-	Flip event.ColumnName = "flip"
+	logDataRequired                    = true
+	numTopicsRequired                  = 4
+	What              event.ColumnName = "what"
+	Flip              event.ColumnName = "flip"
 )
 
 func (converter Converter) ToModels(_ string, logs []core.HeaderSyncLog) ([]event.InsertionModel, error) {
@@ -70,12 +70,12 @@ func (converter Converter) ToModels(_ string, logs []core.HeaderSyncLog) ([]even
 				Flip,
 				event.LogFK,
 			},
-			ColumnValues:   event.ColumnValues{
-				event.HeaderFK: log.HeaderID,
+			ColumnValues: event.ColumnValues{
+				event.HeaderFK:      log.HeaderID,
 				constants.IlkColumn: ilkId,
-				What: what,
-				Flip: flip,
-				event.LogFK: log.ID,
+				What:                what,
+				Flip:                flip,
+				event.LogFK:         log.ID,
 			},
 		}
 

diff --git a/transformers/events/cat_file/flip/converter_test.go b/transformers/events/cat_file/flip/converter_test.go
@@ -34,7 +34,7 @@ import (
 var _ = Describe("Cat file flip converter", func() {
 	var (
 		converter flip.Converter
-		db *postgres.DB
+		db        *postgres.DB
 	)
 
 	BeforeEach(func() {

diff --git a/transformers/events/cat_file/flip/initializer/initializer.go b/transformers/events/cat_file/flip/initializer/initializer.go
@@ -28,5 +28,5 @@ import (
 var EventTransformerInitializer transformer.EventTransformerInitializer = event.Transformer{
 	Config:     shared.GetEventTransformerConfig(constants.CatFileFlipLabel, constants.CatFileFlipSignature()),
 	Converter:  &flip.Converter{},
-	Repository: &flip.CatFileFlipRepository{},
+	Repository: &flip.Repository{},
 }.NewTransformer
diff --git a/transformers/events/cat_file/flip/repository.go b/transformers/events/cat_file/flip/repository.go
@@ -17,19 +17,18 @@
 package flip
 
 import (
+	"github.com/vulcanize/vulcanizedb/libraries/shared/factories/event"
 	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres"
-
-	"github.com/vulcanize/mcd_transformers/transformers/shared"
 )
 
-type CatFileFlipRepository struct {
+type Repository struct {
 	db *postgres.DB
 }
 
-func (repository CatFileFlipRepository) Create(models []shared.InsertionModel) error {
-	return shared.Create(models, repository.db)
+func (repository Repository) Create(models []event.InsertionModel) error {
+	return event.Create(models, repository.db)
 }
 
-func (repository *CatFileFlipRepository) SetDB(db *postgres.DB) {
+func (repository *Repository) SetDB(db *postgres.DB) {
 	repository.db = db
 }
diff --git a/transformers/integration_tests/cat_file.go b/transformers/integration_tests/cat_file.go
@@ -28,6 +28,7 @@ import (
 	"github.com/vulcanize/mcd_transformers/transformers/shared"
 	"github.com/vulcanize/mcd_transformers/transformers/shared/constants"
 	"github.com/vulcanize/mcd_transformers/transformers/test_data"
+	"github.com/vulcanize/vulcanizedb/libraries/shared/factories/event"
 	"github.com/vulcanize/vulcanizedb/libraries/shared/fetcher"
 	"github.com/vulcanize/vulcanizedb/libraries/shared/transformer"
 	"github.com/vulcanize/vulcanizedb/pkg/core"
@@ -151,13 +152,13 @@ var _ = Describe("Cat File transformer", func() {
 		catFileConfig.StartingBlockNumber = flipBlockNumber
 		catFileConfig.EndingBlockNumber = flipBlockNumber
 
-		initializer := shared.EventTransformer{
+		initializer := event.Transformer{
 			Config:     catFileConfig,
 			Converter:  &flip.Converter{},
-			Repository: &flip.CatFileFlipRepository{},
+			Repository: &flip.Repository{},
 		}
 
-		t := initializer.NewEventTransformer(db)
+		t := initializer.NewTransformer(db)
 
 		logs, err := logFetcher.FetchLogs(
 			[]common.Address{common.HexToAddress(catFileConfig.ContractAddresses[0])},

diff --git a/transformers/test_data/cat_file.go b/transformers/test_data/cat_file.go
@@ -153,10 +153,10 @@ var catFileFlipModel = event.InsertionModel{
 		flip.Flip,
 		constants.LogFK,
 	},
-	ColumnValues:   event.ColumnValues{
-		event.HeaderFK: CatFileFlipHeaderSyncLog.HeaderID,
-		flip.What:             "flip",
-		flip.Flip:             "0x6E8032435c84B08E30F27bfbb812Ee365A095b31",
+	ColumnValues: event.ColumnValues{
+		event.HeaderFK:  CatFileFlipHeaderSyncLog.HeaderID,
+		flip.What:       "flip",
+		flip.Flip:       "0x6E8032435c84B08E30F27bfbb812Ee365A095b31",
 		constants.LogFK: CatFileFlipHeaderSyncLog.ID,
 	},
 }