Flop deal (#39)

*Refactor deal transformer to take in several contract addresses
* Add flop address to deal transformer

pkg/transformers/flip_kick/config.go

@@ -17,7 +17,7 @@ package flip_kick
 import "github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
 
 var FlipKickConfig = shared.TransformerConfig{
-	ContractAddress:     shared.FlipperContractAddress,
+	ContractAddresses:   []string{shared.FlipperContractAddress},
 	ContractAbi:         shared.FlipperABI,
 	Topics:              []string{shared.FlipKickSignature},
 	StartingBlockNumber: 0,

pkg/transformers/flip_kick/converter.go

@@ -28,16 +28,16 @@ import (
 )
 
 type Converter interface {
-	ToEntities(contractAddress string, contractAbi string, ethLogs []types.Log) ([]FlipKickEntity, error)
+	ToEntities(contractAbi string, ethLogs []types.Log) ([]FlipKickEntity, error)
 	ToModels(flipKicks []FlipKickEntity) ([]FlipKickModel, error)
 }
 
 type FlipKickConverter struct{}
 
-func (FlipKickConverter) ToEntities(contractAddress string, contractAbi string, ethLogs []types.Log) (results []FlipKickEntity, err error) {
+func (FlipKickConverter) ToEntities(contractAbi string, ethLogs []types.Log) (results []FlipKickEntity, err error) {
 	for _, ethLog := range ethLogs {
 		entity := &FlipKickEntity{}
-		address := common.HexToAddress(contractAddress)
+		address := ethLog.Address
 		abi, err := geth.ParseAbi(contractAbi)
 		if err != nil {
 			return nil, err

pkg/transformers/flip_kick/converter_test.go

@@ -33,7 +33,7 @@ var _ = Describe("FlipKick Converter", func() {
 
 	Describe("ToEntity", func() {
 		It("converts an Eth Log to a FlipKickEntity", func() {
-			entities, err := converter.ToEntities(shared.FlipperContractAddress, shared.FlipperABI, []types.Log{test_data.EthFlipKickLog})
+			entities, err := converter.ToEntities(shared.FlipperABI, []types.Log{test_data.EthFlipKickLog})
 
 			Expect(err).NotTo(HaveOccurred())
 			Expect(len(entities)).To(Equal(1))
@@ -49,7 +49,7 @@ var _ = Describe("FlipKick Converter", func() {
 		})
 
 		It("returns an error if converting log to entity fails", func() {
-			_, err := converter.ToEntities(shared.FlipperContractAddress, "error abi", []types.Log{test_data.EthFlipKickLog})
+			_, err := converter.ToEntities("error abi", []types.Log{test_data.EthFlipKickLog})
 
 			Expect(err).To(HaveOccurred())
 		})

pkg/transformers/flip_kick/transformer.go

@@ -91,10 +91,11 @@ func (fkt FlipKickTransformer) Execute() error {
 	log.Printf("Fetching flip kick event logs for %d headers \n", len(headers))
 	var resultingErrors []error
 	for _, header := range headers {
-		ethLogs, err := fkt.Fetcher.FetchLogs(config.ContractAddress, topics, header.BlockNumber)
+		ethLogs, err := fkt.Fetcher.FetchLogs(config.ContractAddresses, topics, header.BlockNumber)
 		if err != nil {
 			resultingErrors = append(resultingErrors, newTransformerError(err, header.BlockNumber, FetcherError))
 		}
+
 		if len(ethLogs) < 1 {
 			err := fkt.Repository.MarkHeaderChecked(header.Id)
 			if err != nil {
@@ -102,7 +103,7 @@ func (fkt FlipKickTransformer) Execute() error {
 			}
 		}
 
-		entities, err := fkt.Converter.ToEntities(config.ContractAddress, config.ContractAbi, ethLogs)
+		entities, err := fkt.Converter.ToEntities(config.ContractAbi, ethLogs)
 		if err != nil {
 			resultingErrors = append(resultingErrors, newTransformerError(err, header.BlockNumber, LogToEntityError))
 		}

pkg/transformers/flip_kick/transformer_test.go

@@ -36,7 +36,6 @@ var _ = Describe("FlipKick Transformer", func() {
 	var fetcher mocks.MockLogFetcher
 	var converter flip_kick_mocks.MockFlipKickConverter
 	var repository flip_kick_mocks.MockFlipKickRepository
-	var testConfig shared.TransformerConfig
 	var blockNumber int64
 	var headerId int64
 	var headers []core.Header
@@ -51,16 +50,7 @@ var _ = Describe("FlipKick Transformer", func() {
 			Converter:  &converter,
 			Repository: &repository,
 		}
-
-		startingBlockNumber := rand.Int63()
-		testConfig = shared.TransformerConfig{
-			ContractAddress:     "0x12345",
-			ContractAbi:         "test abi",
-			Topics:              []string{shared.FlipKickSignature},
-			StartingBlockNumber: startingBlockNumber,
-			EndingBlockNumber:   startingBlockNumber + 5,
-		}
-		transformer.SetConfig(testConfig)
+		transformer.SetConfig(flip_kick.FlipKickConfig)
 
 		blockNumber = rand.Int63()
 		headerId = rand.Int63()
@@ -83,7 +73,7 @@ var _ = Describe("FlipKick Transformer", func() {
 		err := transformer.Execute()
 		Expect(err).NotTo(HaveOccurred())
 
-		Expect(fetcher.FetchedContractAddress).To(Equal(testConfig.ContractAddress))
+		Expect(fetcher.FetchedContractAddresses).To(Equal([][]string{flip_kick.FlipKickConfig.ContractAddresses}))
 		Expect(fetcher.FetchedTopics).To(Equal(expectedTopics))
 		Expect(fetcher.FetchedBlocks).To(Equal([]int64{blockNumber}))
 	})
@@ -136,8 +126,8 @@ var _ = Describe("FlipKick Transformer", func() {
 		err := transformer.Execute()
 		Expect(err).NotTo(HaveOccurred())
 
-		Expect(converter.ConverterContract).To(Equal(testConfig.ContractAddress))
-		Expect(converter.ConverterAbi).To(Equal(testConfig.ContractAbi))
+		Expect(converter.ConverterContracts).To(Equal(flip_kick.FlipKickConfig.ContractAddresses))
+		Expect(converter.ConverterAbi).To(Equal(flip_kick.FlipKickConfig.ContractAbi))
 		Expect(converter.LogsToConvert).To(Equal(logs))
 		Expect(converter.EntitiesToConvert).To(Equal([]flip_kick.FlipKickEntity{test_data.FlipKickEntity}))
 	})
@@ -175,7 +165,7 @@ var _ = Describe("FlipKick Transformer", func() {
 		err := transformer.Execute()
 		Expect(err).NotTo(HaveOccurred())
 
-		Expect(repository.StartingBlockNumber).To(Equal(testConfig.StartingBlockNumber))
-		Expect(repository.EndingBlockNumber).To(Equal(testConfig.EndingBlockNumber))
+		Expect(repository.StartingBlockNumber).To(Equal(flip_kick.FlipKickConfig.StartingBlockNumber))
+		Expect(repository.EndingBlockNumber).To(Equal(flip_kick.FlipKickConfig.EndingBlockNumber))
 	})
 })