fixes for review comments

pkg/contract_watcher/shared/contract/contract.go

@@ -67,7 +67,7 @@ func (c Contract) Init() *Contract {
 	return &c
 }
 
-// Use contract info to generate event filters - full sync omni watcher only
+// Use contract info to generate event filters - full sync contract watcher only
 func (c *Contract) GenerateFilters() error {
 	c.Filters = map[string]filters.LogFilter{}
 

pkg/contract_watcher/shared/helpers/test_helpers/mocks/entities.go

@@ -18,13 +18,13 @@ package mocks
 
 import (
 	"encoding/json"
-	"github.com/vulcanize/vulcanizedb/pkg/config"
 	"strings"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
 
+	"github.com/vulcanize/vulcanizedb/pkg/config"
 	"github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants"
 	"github.com/vulcanize/vulcanizedb/pkg/core"
 	"github.com/vulcanize/vulcanizedb/pkg/filters"
@@ -262,74 +262,46 @@ var MockNewOwnerLog2 = types.Log{
 var ens = strings.ToLower(constants.EnsContractAddress)
 var tusd = strings.ToLower(constants.TusdContractAddress)
 
-var TusdConfig = config.ContractConfig{
+var MockConfig = config.ContractConfig{
 	Network: "",
 	Addresses: map[string]bool{
-		tusd: true,
+		"0x1234567890abcdef": true,
 	},
 	Abis: map[string]string{
-		tusd: "",
+		"0x1234567890abcdef": "fake_abi",
 	},
 	Events: map[string][]string{
-		tusd: []string{"Transfer"},
+		"0x1234567890abcdef": []string{"Transfer"},
 	},
 	Methods: map[string][]string{
-		tusd: nil,
+		"0x1234567890abcdef": nil,
 	},
 	MethodArgs: map[string][]string{
-		tusd: nil,
+		"0x1234567890abcdef": nil,
 	},
 	EventArgs: map[string][]string{
-		tusd: nil,
+		"0x1234567890abcdef": nil,
 	},
 }
 
-var ENSConfig = config.ContractConfig{
+var MockEmptyConfig = config.ContractConfig{
 	Network: "",
 	Addresses: map[string]bool{
-		ens: true,
+		"0x1234567890abcdef": true,
 	},
 	Abis: map[string]string{
-		ens: "",
+		"0x1234567890abcdef": "fake_abi",
 	},
 	Events: map[string][]string{
-		ens: []string{"NewOwner"},
+		"0x1234567890abcdef": nil,
 	},
 	Methods: map[string][]string{
-		ens: nil,
+		"0x1234567890abcdef": nil,
 	},
 	MethodArgs: map[string][]string{
-		ens: nil,
+		"0x1234567890abcdef": nil,
 	},
 	EventArgs: map[string][]string{
-		ens: nil,
-	},
-}
-
-var ENSandTusdConfig = config.ContractConfig{
-	Network: "",
-	Addresses: map[string]bool{
-		ens:  true,
-		tusd: true,
-	},
-	Abis: map[string]string{
-		ens:  "",
-		tusd: "",
-	},
-	Events: map[string][]string{
-		ens:  []string{"NewOwner"},
-		tusd: []string{"Transfer"},
-	},
-	Methods: map[string][]string{
-		ens:  nil,
-		tusd: nil,
-	},
-	MethodArgs: map[string][]string{
-		ens:  nil,
-		tusd: nil,
-	},
-	EventArgs: map[string][]string{
-		ens:  nil,
-		tusd: nil,
+		"0x1234567890abcdef": nil,
 	},
 }

pkg/contract_watcher/shared/helpers/test_helpers/test_data.go

@@ -0,0 +1,109 @@
+// VulcanizeDB
+// Copyright © 2019 Vulcanize
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package test_helpers
+
+import (
+	"strings"
+
+	"github.com/vulcanize/vulcanizedb/pkg/config"
+	"github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants"
+)
+
+var ens = strings.ToLower(constants.EnsContractAddress)
+var tusd = strings.ToLower(constants.TusdContractAddress)
+
+var TusdConfig = config.ContractConfig{
+	Network: "",
+	Addresses: map[string]bool{
+		tusd: true,
+	},
+	Abis: map[string]string{
+		tusd: "",
+	},
+	Events: map[string][]string{
+		tusd: []string{"Transfer"},
+	},
+	Methods: map[string][]string{
+		tusd: nil,
+	},
+	MethodArgs: map[string][]string{
+		tusd: nil,
+	},
+	EventArgs: map[string][]string{
+		tusd: nil,
+	},
+	StartingBlocks: map[string]int64{
+		tusd: 5197514,
+	},
+}
+
+var ENSConfig = config.ContractConfig{
+	Network: "",
+	Addresses: map[string]bool{
+		ens: true,
+	},
+	Abis: map[string]string{
+		ens: "",
+	},
+	Events: map[string][]string{
+		ens: []string{"NewOwner"},
+	},
+	Methods: map[string][]string{
+		ens: nil,
+	},
+	MethodArgs: map[string][]string{
+		ens: nil,
+	},
+	EventArgs: map[string][]string{
+		ens: nil,
+	},
+	StartingBlocks: map[string]int64{
+		ens: 3327417,
+	},
+}
+
+var ENSandTusdConfig = config.ContractConfig{
+	Network: "",
+	Addresses: map[string]bool{
+		ens:  true,
+		tusd: true,
+	},
+	Abis: map[string]string{
+		ens:  "",
+		tusd: "",
+	},
+	Events: map[string][]string{
+		ens:  []string{"NewOwner"},
+		tusd: []string{"Transfer"},
+	},
+	Methods: map[string][]string{
+		ens:  nil,
+		tusd: nil,
+	},
+	MethodArgs: map[string][]string{
+		ens:  nil,
+		tusd: nil,
+	},
+	EventArgs: map[string][]string{
+		ens:  nil,
+		tusd: nil,
+	},
+	StartingBlocks: map[string]int64{
+		ens:  3327417,
+		tusd: 5197514,
+	},
+}

pkg/contract_watcher/shared/repository/event_repository_test.go

@@ -134,7 +134,8 @@ var _ = Describe("Repository", func() {
 
 		Describe("PersistLogs", func() {
 			BeforeEach(func() {
-				c := fc.NewConverter(con)
+				c := fc.Converter{}
+				c.Update(con)
 				log, err = c.Convert(mockEvent, event)
 				Expect(err).ToNot(HaveOccurred())
 			})
@@ -276,7 +277,8 @@ var _ = Describe("Repository", func() {
 				headerRepository := repositories.NewHeaderRepository(db)
 				headerID, err = headerRepository.CreateOrUpdateHeader(mocks.MockHeader1)
 				Expect(err).ToNot(HaveOccurred())
-				c := lc.NewConverter(con)
+				c := lc.Converter{}
+				c.Update(con)
 				logs, err = c.Convert([]geth.Log{mockLog1, mockLog2}, event, headerID)
 				Expect(err).ToNot(HaveOccurred())
 			})

pkg/contract_watcher/shared/retriever/address_retriever_test.go

@@ -64,7 +64,8 @@ var _ = Describe("Address Retriever Test", func() {
 		err = info.GenerateFilters()
 		Expect(err).ToNot(HaveOccurred())
 
-		c := converter.NewConverter(info)
+		c := converter.Converter{}
+		c.Update(info)
 		log, err = c.Convert(mockEvent, event)
 		Expect(err).ToNot(HaveOccurred())
 

pkg/contract_watcher/shared/types/event.go

@@ -38,7 +38,7 @@ type Field struct {
 
 // Struct to hold instance of an event log data
 type Log struct {
-	Id     int64             // VulcanizeIdLog for full sync and header ID for light sync omni watcher
+	Id     int64             // VulcanizeIdLog for full sync and header ID for light sync contract watcher
 	Values map[string]string // Map of event input names to their values
 
 	// Used for full sync only

pkg/contract_watcher/shared/types/mode.go

@@ -47,7 +47,7 @@ func (mode Mode) MarshalText() ([]byte, error) {
 	case FullSync:
 		return []byte("full"), nil
 	default:
-		return nil, fmt.Errorf("omni watcher: unknown mode %d, want LightSync or FullSync", mode)
+		return nil, fmt.Errorf("contract watcher: unknown mode %d, want LightSync or FullSync", mode)
 	}
 }
 
@@ -58,7 +58,7 @@ func (mode *Mode) UnmarshalText(text []byte) error {
 	case "full":
 		*mode = FullSync
 	default:
-		return fmt.Errorf(`omni watcher: unknown mode %q, want "light" or "full"`, text)
+		return fmt.Errorf(`contract watcher: unknown mode %q, want "light" or "full"`, text)
 	}
 	return nil
 }