fixes for review comments

pkg/contract_watcher/light/converter/converter.go

@@ -32,28 +32,22 @@ import (
 	"github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types"
 )
 
-type Converter interface {
+type ConverterInterface interface {
 	Convert(logs []gethTypes.Log, event types.Event, headerID int64) ([]types.Log, error)
 	ConvertBatch(logs []gethTypes.Log, events map[string]types.Event, headerID int64) (map[string][]types.Log, error)
 	Update(info *contract.Contract)
 }
 
-type converter struct {
+type Converter struct {
 	ContractInfo *contract.Contract
 }
 
-func NewConverter(info *contract.Contract) *converter {
-	return &converter{
-		ContractInfo: info,
-	}
-}
-
-func (c *converter) Update(info *contract.Contract) {
+func (c *Converter) Update(info *contract.Contract) {
 	c.ContractInfo = info
 }
 
 // Convert the given watched event log into a types.Log for the given event
-func (c *converter) Convert(logs []gethTypes.Log, event types.Event, headerID int64) ([]types.Log, error) {
+func (c *Converter) Convert(logs []gethTypes.Log, event types.Event, headerID int64) ([]types.Log, error) {
 	contract := bind.NewBoundContract(common.HexToAddress(c.ContractInfo.Address), c.ContractInfo.ParsedAbi, nil, nil, nil)
 	returnLogs := make([]types.Log, 0, len(logs))
 	for _, log := range logs {
@@ -132,7 +126,7 @@ func (c *converter) Convert(logs []gethTypes.Log, event types.Event, headerID in
 }
 
 // Convert the given watched event logs into types.Logs; returns a map of event names to a slice of their converted logs
-func (c *converter) ConvertBatch(logs []gethTypes.Log, events map[string]types.Event, headerID int64) (map[string][]types.Log, error) {
+func (c *Converter) ConvertBatch(logs []gethTypes.Log, events map[string]types.Event, headerID int64) (map[string][]types.Log, error) {
 	contract := bind.NewBoundContract(common.HexToAddress(c.ContractInfo.Address), c.ContractInfo.ParsedAbi, nil, nil, nil)
 	eventsToLogs := make(map[string][]types.Log)
 	for _, event := range events {

pkg/contract_watcher/light/converter/converter_test.go

@@ -38,7 +38,8 @@ var _ = Describe("Converter", func() {
 	Describe("Update", func() {
 		It("Updates contract info held by the converter", func() {
 			con = test_helpers.SetupTusdContract(tusdWantedEvents, []string{})
-			c := converter.NewConverter(con)
+			c := converter.Converter{}
+			c.Update(con)
 			Expect(c.ContractInfo).To(Equal(con))
 
 			info := test_helpers.SetupTusdContract([]string{}, []string{})
@@ -56,7 +57,8 @@ var _ = Describe("Converter", func() {
 			event, ok := con.Events["Transfer"]
 			Expect(ok).To(Equal(true))
 
-			c := converter.NewConverter(con)
+			c := converter.Converter{}
+			c.Update(con)
 			logs, err := c.Convert([]types.Log{mocks.MockTransferLog1, mocks.MockTransferLog2}, event, 232)
 			Expect(err).ToNot(HaveOccurred())
 			Expect(len(logs)).To(Equal(2))
@@ -80,7 +82,8 @@ var _ = Describe("Converter", func() {
 			event, ok := con.Events["Transfer"]
 			Expect(ok).To(Equal(true))
 
-			c := converter.NewConverter(con)
+			c := converter.Converter{}
+			c.Update(con)
 			_, err := c.Convert([]types.Log{mocks.MockTransferLog1, mocks.MockTransferLog2}, event, 232)
 			Expect(err).ToNot(HaveOccurred())
 
@@ -110,7 +113,8 @@ var _ = Describe("Converter", func() {
 			event, ok := con.Events["NewOwner"]
 			Expect(ok).To(Equal(true))
 
-			c := converter.NewConverter(con)
+			c := converter.Converter{}
+			c.Update(con)
 			_, err := c.Convert([]types.Log{mocks.MockNewOwnerLog1, mocks.MockNewOwnerLog2}, event, 232)
 			Expect(err).ToNot(HaveOccurred())
 			Expect(len(con.EmittedHashes)).To(Equal(3))
@@ -143,7 +147,8 @@ var _ = Describe("Converter", func() {
 
 		It("Fails with an empty contract", func() {
 			event := con.Events["Transfer"]
-			c := converter.NewConverter(&contract.Contract{})
+			c := converter.Converter{}
+			c.Update(&contract.Contract{})
 			_, err = c.Convert([]types.Log{mocks.MockTransferLog1}, event, 232)
 			Expect(err).To(HaveOccurred())
 		})