Changes to address Rob's comments. Added generic/event_triggered transformer, tests, and repo migrations for Burn and Mint events

examples/mocks/converter.go

@@ -0,0 +1,78 @@
+// Copyright 2018 Vulcanize
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package mocks
+
+import (
+	et1 "github.com/vulcanize/vulcanizedb/examples/erc20_watcher/event_triggered"
+	et2 "github.com/vulcanize/vulcanizedb/examples/generic/event_triggered"
+	"github.com/vulcanize/vulcanizedb/pkg/core"
+)
+
+type MockERC20Converter struct {
+	WatchedEvents      []*core.WatchedEvent
+	TransfersToConvert []et1.TransferEntity
+	ApprovalsToConvert []et1.ApprovalEntity
+	BurnsToConvert     []et2.BurnEntity
+	MintsToConvert     []et2.MintEntity
+	block              int64
+}
+
+func (mlkc *MockERC20Converter) ToTransferModel(entity *et1.TransferEntity) *et1.TransferModel {
+	mlkc.TransfersToConvert = append(mlkc.TransfersToConvert, *entity)
+	return &et1.TransferModel{}
+}
+
+func (mlkc *MockERC20Converter) ToTransferEntity(watchedEvent core.WatchedEvent) (*et1.TransferEntity, error) {
+	mlkc.WatchedEvents = append(mlkc.WatchedEvents, &watchedEvent)
+	e := &et1.TransferEntity{Block: watchedEvent.BlockNumber}
+	mlkc.block++
+	return e, nil
+}
+
+func (mlkc *MockERC20Converter) ToApprovalModel(entity *et1.ApprovalEntity) *et1.ApprovalModel {
+	mlkc.ApprovalsToConvert = append(mlkc.ApprovalsToConvert, *entity)
+	return &et1.ApprovalModel{}
+}
+
+func (mlkc *MockERC20Converter) ToApprovalEntity(watchedEvent core.WatchedEvent) (*et1.ApprovalEntity, error) {
+	mlkc.WatchedEvents = append(mlkc.WatchedEvents, &watchedEvent)
+	e := &et1.ApprovalEntity{Block: watchedEvent.BlockNumber}
+	mlkc.block++
+	return e, nil
+}
+
+func (mlkc *MockERC20Converter) ToBurnEntity(watchedEvent core.WatchedEvent) (*et2.BurnEntity, error) {
+	mlkc.WatchedEvents = append(mlkc.WatchedEvents, &watchedEvent)
+	e := &et2.BurnEntity{Block: watchedEvent.BlockNumber}
+	mlkc.block++
+	return e, nil
+}
+
+func (mlkc *MockERC20Converter) ToBurnModel(entity *et2.BurnEntity) *et2.BurnModel {
+	mlkc.BurnsToConvert = append(mlkc.BurnsToConvert, *entity)
+	return &et2.BurnModel{}
+}
+
+func (mlkc *MockERC20Converter) ToMintEntity(watchedEvent core.WatchedEvent) (*et2.MintEntity, error) {
+	mlkc.WatchedEvents = append(mlkc.WatchedEvents, &watchedEvent)
+	e := &et2.MintEntity{Block: watchedEvent.BlockNumber}
+	mlkc.block++
+	return e, nil
+}
+
+func (mlkc *MockERC20Converter) ToMintModel(entity *et2.MintEntity) *et2.MintModel {
+	mlkc.MintsToConvert = append(mlkc.MintsToConvert, *entity)
+	return &et2.MintModel{}
+}

examples/mocks/event_repo.go

@@ -15,7 +15,8 @@
 package mocks
 
 import (
-	"github.com/vulcanize/vulcanizedb/examples/erc20_watcher/event_triggered"
+	et1 "github.com/vulcanize/vulcanizedb/examples/erc20_watcher/event_triggered"
+	et2 "github.com/vulcanize/vulcanizedb/examples/generic/event_triggered"
 	"github.com/vulcanize/vulcanizedb/pkg/core"
 	"github.com/vulcanize/vulcanizedb/pkg/filters"
 )
@@ -23,6 +24,8 @@ import (
 type MockWatchedEventsRepository struct {
 	watchedTransferEvents []*core.WatchedEvent
 	watchedApprovalEvents []*core.WatchedEvent
+	watchedBurnEvents     []*core.WatchedEvent
+	watchedMintEvents     []*core.WatchedEvent
 	Names                 []string
 }
 
@@ -34,6 +37,12 @@ func (mwer *MockWatchedEventsRepository) SetWatchedEvents(watchedEvents []*core.
 		if event.Name == "Approval" {
 			mwer.watchedApprovalEvents = append(mwer.watchedApprovalEvents, event)
 		}
+		if event.Name == "Burn" {
+			mwer.watchedBurnEvents = append(mwer.watchedBurnEvents, event)
+		}
+		if event.Name == "Mint" {
+			mwer.watchedMintEvents = append(mwer.watchedMintEvents, event)
+		}
 	}
 }
 
@@ -50,23 +59,47 @@ func (mwer *MockWatchedEventsRepository) GetWatchedEvents(name string) ([]*core.
 		// clear watched events once returned so same events are returned for every filter while testing
 		mwer.watchedApprovalEvents = []*core.WatchedEvent{}
 	}
+	if name == "Burn" {
+		result = mwer.watchedBurnEvents
+		// clear watched events once returned so same events are returned for every filter while testing
+		mwer.watchedBurnEvents = []*core.WatchedEvent{}
+	}
+	if name == "Mint" {
+		result = mwer.watchedMintEvents
+		// clear watched events once returned so same events are returned for every filter while testing
+		mwer.watchedMintEvents = []*core.WatchedEvent{}
+	}
 	return result, nil
 }
 
 type MockEventRepo struct {
-	TransferLogs    []event_triggered.TransferModel
-	ApprovalLogs    []event_triggered.ApprovalModel
+	TransferLogs    []et1.TransferModel
+	ApprovalLogs    []et1.ApprovalModel
+	BurnLogs        []et2.BurnModel
+	MintLogs        []et2.MintModel
 	VulcanizeLogIDs []int64
 }
 
-func (molr *MockEventRepo) CreateTransfer(transferModel event_triggered.TransferModel, vulcanizeLogId int64) error {
-	molr.TransferLogs = append(molr.TransferLogs, transferModel)
+func (molr *MockEventRepo) CreateTransfer(transferModel *et1.TransferModel, vulcanizeLogId int64) error {
+	molr.TransferLogs = append(molr.TransferLogs, *transferModel)
 	molr.VulcanizeLogIDs = append(molr.VulcanizeLogIDs, vulcanizeLogId)
 	return nil
 }
 
-func (molk *MockEventRepo) CreateApproval(approvalModel event_triggered.ApprovalModel, vulcanizeLogID int64) error {
-	molk.ApprovalLogs = append(molk.ApprovalLogs, approvalModel)
+func (molk *MockEventRepo) CreateApproval(approvalModel *et1.ApprovalModel, vulcanizeLogID int64) error {
+	molk.ApprovalLogs = append(molk.ApprovalLogs, *approvalModel)
+	molk.VulcanizeLogIDs = append(molk.VulcanizeLogIDs, vulcanizeLogID)
+	return nil
+}
+
+func (molr *MockEventRepo) CreateBurn(burnModel *et2.BurnModel, vulcanizeLogId int64) error {
+	molr.BurnLogs = append(molr.BurnLogs, *burnModel)
+	molr.VulcanizeLogIDs = append(molr.VulcanizeLogIDs, vulcanizeLogId)
+	return nil
+}
+
+func (molk *MockEventRepo) CreateMint(mintModel *et2.MintModel, vulcanizeLogID int64) error {
+	molk.MintLogs = append(molk.MintLogs, *mintModel)
 	molk.VulcanizeLogIDs = append(molk.VulcanizeLogIDs, vulcanizeLogID)
 	return nil
 }

examples/mocks/fetcher.go

@@ -17,10 +17,11 @@ package mocks
 import (
 	"errors"
 	"math/big"
+	"reflect"
 
 	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/vulcanize/vulcanizedb/pkg/core"
-	"reflect"
 )
 
 type Fetcher struct {

examples/mocks/getter.go

@@ -18,6 +18,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/vulcanize/vulcanizedb/pkg/core"
 )