fixes for review comments

pkg/contract_watcher/full/converter/converter.go

@@ -34,27 +34,21 @@ import (
 
 // Converter is used to convert watched event logs to
 // custom logs containing event input name => value maps
-type Converter interface {
+type ConverterInterface interface {
 	Convert(watchedEvent core.WatchedEvent, event types.Event) (*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(watchedEvent core.WatchedEvent, event types.Event) (*types.Log, error) {
+func (c *Converter) Convert(watchedEvent core.WatchedEvent, event types.Event) (*types.Log, error) {
 	contract := bind.NewBoundContract(common.HexToAddress(c.ContractInfo.Address), c.ContractInfo.ParsedAbi, nil, nil, nil)
 	values := make(map[string]interface{})
 	log := helpers.ConvertToLog(watchedEvent)

pkg/contract_watcher/full/converter/converter_test.go

@@ -39,7 +39,8 @@ var _ = Describe("Converter", func() {
 
 	Describe("Update", func() {
 		It("Updates contract con held by the converter", func() {
-			c := converter.NewConverter(con)
+			c := converter.Converter{}
+			c.Update(con)
 			Expect(c.ContractInfo).To(Equal(con))
 
 			con := test_helpers.SetupTusdContract([]string{}, []string{})
@@ -58,7 +59,8 @@ var _ = Describe("Converter", func() {
 			err = con.GenerateFilters()
 			Expect(err).ToNot(HaveOccurred())
 
-			c := converter.NewConverter(con)
+			c := converter.Converter{}
+			c.Update(con)
 			log, err := c.Convert(mocks.MockTranferEvent, event)
 			Expect(err).ToNot(HaveOccurred())
 
@@ -77,7 +79,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(mocks.MockTranferEvent, event)
 			Expect(err).ToNot(HaveOccurred())
 
@@ -101,7 +104,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(mocks.MockTranferEvent, event)
 			Expect(err).To(HaveOccurred())
 		})