Flop deal (#39)

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

pkg/transformers/test_data/mocks/flip_kick/converter.go

@@ -22,15 +22,17 @@ import (
 )
 
 type MockFlipKickConverter struct {
-	ConverterContract string
-	ConverterAbi      string
-	LogsToConvert     []types.Log
-	EntitiesToConvert []flip_kick.FlipKickEntity
-	ConverterError    error
+	ConverterContracts []string
+	ConverterAbi       string
+	LogsToConvert      []types.Log
+	EntitiesToConvert  []flip_kick.FlipKickEntity
+	ConverterError     error
 }
 
-func (mfkc *MockFlipKickConverter) ToEntities(contractAddress string, contractAbi string, ethLogs []types.Log) ([]flip_kick.FlipKickEntity, error) {
-	mfkc.ConverterContract = contractAddress
+func (mfkc *MockFlipKickConverter) ToEntities(contractAbi string, ethLogs []types.Log) ([]flip_kick.FlipKickEntity, error) {
+	for _, log := range ethLogs {
+		mfkc.ConverterContracts = append(mfkc.ConverterContracts, log.Address.Hex())
+	}
 	mfkc.ConverterAbi = contractAbi
 	mfkc.LogsToConvert = append(mfkc.LogsToConvert, ethLogs...)
 	return []flip_kick.FlipKickEntity{test_data.FlipKickEntity}, mfkc.ConverterError

pkg/transformers/test_data/mocks/flop_kick/converter.go

@@ -21,16 +21,18 @@ import (
 )
 
 type MockConverter struct {
-	PassedContractAddress string
-	PassedContractABI     string
-	PassedLogs            []types.Log
-	PassedEntities        []flop_kick.Entity
-	entityConverterError  error
-	modelConverterError   error
+	PassedContractAddresses []string
+	PassedContractABI       string
+	PassedLogs              []types.Log
+	PassedEntities          []flop_kick.Entity
+	entityConverterError    error
+	modelConverterError     error
 }
 
-func (c *MockConverter) ToEntities(contractAddress, contractAbi string, ethLogs []types.Log) ([]flop_kick.Entity, error) {
-	c.PassedContractAddress = contractAddress
+func (c *MockConverter) ToEntities(contractAbi string, ethLogs []types.Log) ([]flop_kick.Entity, error) {
+	for _, log := range ethLogs {
+		c.PassedContractAddresses = append(c.PassedContractAddresses, log.Address.Hex())
+	}
 	c.PassedContractABI = contractAbi
 	c.PassedLogs = ethLogs
 

pkg/transformers/test_data/mocks/log_fetcher.go

@@ -20,15 +20,15 @@ import (
 )
 
 type MockLogFetcher struct {
-	FetchedContractAddress string
-	FetchedTopics          [][]common.Hash
-	FetchedBlocks          []int64
-	fetcherError           error
-	FetchedLogs            []types.Log
+	FetchedContractAddresses [][]string
+	FetchedTopics            [][]common.Hash
+	FetchedBlocks            []int64
+	fetcherError             error
+	FetchedLogs              []types.Log
 }
 
-func (mlf *MockLogFetcher) FetchLogs(contractAddress string, topics [][]common.Hash, blockNumber int64) ([]types.Log, error) {
-	mlf.FetchedContractAddress = contractAddress
+func (mlf *MockLogFetcher) FetchLogs(contractAddresses []string, topics [][]common.Hash, blockNumber int64) ([]types.Log, error) {
+	mlf.FetchedContractAddresses = append(mlf.FetchedContractAddresses, contractAddresses)
 	mlf.FetchedTopics = topics
 	mlf.FetchedBlocks = append(mlf.FetchedBlocks, blockNumber)
 

pkg/transformers/test_data/mocks/tend/converter.go

@@ -26,7 +26,7 @@ type MockTendConverter struct {
 	ConverterError error
 }
 
-func (c *MockTendConverter) Convert(ethLogs []types.Log) ([]tend.TendModel, error) {
+func (c *MockTendConverter) ToModels(ethLogs []types.Log) ([]tend.TendModel, error) {
 	c.LogsToConvert = append(c.LogsToConvert, ethLogs...)
 	return []tend.TendModel{test_data.TendModel}, c.ConverterError
 }