Deal transformer (#19)

pkg/transformers/dent/converter.go

@@ -24,7 +24,7 @@ import (
 )
 
 type Converter interface {
-	Convert(contractAddress string, contractAbi string, ethLog types.Log) (DentModel, error)
+	ToModel(ethLog types.Log) (DentModel, error)
 }
 
 type DentConverter struct{}
@@ -33,7 +33,7 @@ func NewDentConverter() DentConverter {
 	return DentConverter{}
 }
 
-func (c DentConverter) Convert(contractAddress, contractAbi string, ethLog types.Log) (DentModel, error) {
+func (c DentConverter) ToModel(ethLog types.Log) (DentModel, error) {
 	err := validateLog(ethLog)
 	if err != nil {
 		return DentModel{}, err

pkg/transformers/dent/converter_test.go

@@ -20,7 +20,6 @@ import (
 	. "github.com/onsi/gomega"
 
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/dent"
-	"github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data"
 )
 
@@ -32,7 +31,7 @@ var _ = Describe("Dent Converter", func() {
 	})
 
 	It("converts an eth log to a db model", func() {
-		model, err := converter.Convert(shared.FlipperContractAddress, shared.FlipperABI, test_data.DentLog)
+		model, err := converter.ToModel(test_data.DentLog)
 
 		Expect(err).NotTo(HaveOccurred())
 		Expect(model).To(Equal(test_data.DentModel))
@@ -41,7 +40,7 @@ var _ = Describe("Dent Converter", func() {
 	It("returns an error if the expected amount of topics aren't in the log", func() {
 		invalidLog := test_data.DentLog
 		invalidLog.Topics = []common.Hash{}
-		model, err := converter.Convert(shared.FlipperContractAddress, shared.FlipperABI, invalidLog)
+		model, err := converter.ToModel(invalidLog)
 		Expect(err).To(HaveOccurred())
 		Expect(err).To(MatchError("dent log does not contain expected topics"))
 		Expect(model).To(Equal(dent.DentModel{}))
@@ -50,7 +49,7 @@ var _ = Describe("Dent Converter", func() {
 	It("returns an error if the log data is empty", func() {
 		emptyDataLog := test_data.DentLog
 		emptyDataLog.Data = []byte{}
-		model, err := converter.Convert(shared.FlipperContractAddress, shared.FlipperABI, emptyDataLog)
+		model, err := converter.ToModel(emptyDataLog)
 		Expect(err).To(HaveOccurred())
 		Expect(err).To(MatchError("dent log data is empty"))
 		Expect(model).To(Equal(dent.DentModel{}))

pkg/transformers/dent/transformer.go

@@ -60,7 +60,7 @@ func (t DentTransformer) Execute() error {
 		}
 
 		for _, ethLog := range ethLogs {
-			model, err := t.Converter.Convert(config.ContractAddress, config.ContractAbi, ethLog)
+			model, err := t.Converter.ToModel(ethLog)
 
 			if err != nil {
 				log.Println("Error converting dent log", err)

pkg/transformers/dent/transformer_test.go

@@ -93,8 +93,6 @@ var _ = Describe("DentTransformer", func() {
 		err := transformer.Execute()
 
 		Expect(err).NotTo(HaveOccurred())
-		Expect(converter.PassedContractAddress).To(Equal(config.ContractAddress))
-		Expect(converter.PassedContractAbi).To(Equal(config.ContractAbi))
 		Expect(converter.LogsToConvert).To(Equal([]types.Log{test_data.DentLog}))
 	})