Merge branch 'staging' into VDB-125-aggregate-log-fetching

pkg/transformers/integration_tests/pit_file_debt_ceiling.go

@@ -74,6 +74,6 @@ var _ = Describe("PitFileDebtCeiling LogNoteTransformer", func() {
 
 		Expect(len(dbResult)).To(Equal(1))
 		Expect(dbResult[0].What).To(Equal("Line"))
-		Expect(dbResult[0].Data).To(Equal("10000000000000000000000000"))
+		Expect(dbResult[0].Data).To(Equal("10000000.000000000000000000"))
 	})
 })

pkg/transformers/integration_tests/pit_file_ilk.go

@@ -18,15 +18,15 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"github.com/vulcanize/vulcanizedb/pkg/transformers/factories"
-	"github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
 
+	"github.com/vulcanize/vulcanizedb/pkg/transformers/factories"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/pit_file/ilk"
+	"github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
 	"github.com/vulcanize/vulcanizedb/test_config"
 )
 
 var _ = Describe("PitFileIlk LogNoteTransformer", func() {
-	It("fetches and transforms a PitFileIlk event from Kovan chain", func() {
+	It("fetches and transforms a Pit.file ilk 'spot' event from Kovan", func() {
 		blockNumber := int64(9103223)
 		config := ilk.IlkFileConfig
 		config.StartingBlockNumber = blockNumber
@@ -67,6 +67,48 @@ var _ = Describe("PitFileIlk LogNoteTransformer", func() {
 		Expect(len(dbResult)).To(Equal(1))
 		Expect(dbResult[0].Ilk).To(Equal("ETH"))
 		Expect(dbResult[0].What).To(Equal("spot"))
-		Expect(dbResult[0].Data).To(Equal("139840000000000000000000000000"))
+		Expect(dbResult[0].Data).To(Equal("139.840000000000003410605131648"))
+	})
+
+	It("fetches and transforms a Pit.file ilk 'line' event from Kovan", func() {
+		blockNumber := int64(8762253)
+		config := ilk.IlkFileConfig
+		config.StartingBlockNumber = blockNumber
+		config.EndingBlockNumber = blockNumber
+
+		rpcClient, ethClient, err := getClients(ipc)
+		Expect(err).NotTo(HaveOccurred())
+		blockChain, err := getBlockChain(rpcClient, ethClient)
+		Expect(err).NotTo(HaveOccurred())
+
+		db := test_config.NewTestDB(blockChain.Node())
+		test_config.CleanTestDB(db)
+
+		err = persistHeader(db, blockNumber, blockChain)
+		Expect(err).NotTo(HaveOccurred())
+
+		initializer := factories.LogNoteTransformer{
+			Config:     config,
+			Fetcher:    &shared.Fetcher{},
+			Converter:  &ilk.PitFileIlkConverter{},
+			Repository: &ilk.PitFileIlkRepository{},
+		}
+		transformer := initializer.NewLogNoteTransformer(db, blockChain)
+		err = transformer.Execute()
+		Expect(err).NotTo(HaveOccurred())
+
+		var dbResult []ilk.PitFileIlkModel
+		err = db.Select(&dbResult, `SELECT ilk, what, data from maker.pit_file_ilk`)
+		Expect(err).NotTo(HaveOccurred())
+
+		Expect(len(dbResult)).To(Equal(2))
+		var pitFileIlkLineModel ilk.PitFileIlkModel
+		for _, result := range dbResult {
+			if result.What == "line" {
+				pitFileIlkLineModel = result
+			}
+		}
+		Expect(pitFileIlkLineModel.Ilk).To(Equal("REP"))
+		Expect(pitFileIlkLineModel.Data).To(Equal("2000000.000000000000000000"))
 	})
 })

pkg/transformers/integration_tests/vat_fold.go

@@ -43,7 +43,7 @@ var _ = Describe("VatFold Transformer", func() {
 	})
 
 	It("transforms VatFold log events", func() {
-		blockNumber := int64(9051149)
+		blockNumber := int64(9367233)
 		config := vat_fold.VatFoldConfig
 		config.StartingBlockNumber = blockNumber
 		config.EndingBlockNumber = blockNumber
@@ -75,6 +75,6 @@ var _ = Describe("VatFold Transformer", func() {
 		dbResult := dbResults[0]
 		Expect(dbResult.Ilk).To(Equal("REP"))
 		Expect(dbResult.Urn).To(Equal(common.HexToAddress("0x0000000000000000000000003728e9777b2a0a611ee0f89e00e01044ce4736d1").String()))
-		Expect(dbResult.Rate).To(Equal("0"))
+		Expect(dbResult.Rate).To(Equal("0.000000000000000000000000000"))
 	})
 })