Rename StorageDiffRow -> StorageDiff

libraries/shared/fetcher/csv_tail_storage_fetcher.go

@@ -33,18 +33,18 @@ func NewCsvTailStorageFetcher(tailer fs.Tailer) CsvTailStorageFetcher {
 	return CsvTailStorageFetcher{tailer: tailer}
 }
 
-func (storageFetcher CsvTailStorageFetcher) FetchStorageDiffs(out chan<- utils.StorageDiffRow, errs chan<- error) {
+func (storageFetcher CsvTailStorageFetcher) FetchStorageDiffs(out chan<- utils.StorageDiff, errs chan<- error) {
 	t, tailErr := storageFetcher.tailer.Tail()
 	if tailErr != nil {
 		errs <- tailErr
 	}
 	log.Debug("fetching storage diffs...")
 	for line := range t.Lines {
-		row, parseErr := utils.FromStrings(strings.Split(line.Text, ","))
+		diff, parseErr := utils.FromStrings(strings.Split(line.Text, ","))
 		if parseErr != nil {
 			errs <- parseErr
 		} else {
-			out <- row
+			out <- diff
 		}
 	}
 }

libraries/shared/fetcher/csv_tail_storage_fetcher_test.go

@@ -35,13 +35,13 @@ var _ = Describe("Csv Tail Storage Fetcher", func() {
 	var (
 		errorsChannel  chan error
 		mockTailer     *fakes.MockTailer
-		rowsChannel    chan utils.StorageDiffRow
+		diffsChannel   chan utils.StorageDiff
 		storageFetcher fetcher.CsvTailStorageFetcher
 	)
 
 	BeforeEach(func() {
 		errorsChannel = make(chan error)
-		rowsChannel = make(chan utils.StorageDiffRow)
+		diffsChannel = make(chan utils.StorageDiff)
 		mockTailer = fakes.NewMockTailer()
 		storageFetcher = fetcher.NewCsvTailStorageFetcher(mockTailer)
 	})
@@ -49,7 +49,7 @@ var _ = Describe("Csv Tail Storage Fetcher", func() {
 	It("adds error to errors channel if tailing file fails", func(done Done) {
 		mockTailer.TailErr = fakes.FakeError
 
-		go storageFetcher.FetchStorageDiffs(rowsChannel, errorsChannel)
+		go storageFetcher.FetchStorageDiffs(diffsChannel, errorsChannel)
 
 		Expect(<-errorsChannel).To(MatchError(fakes.FakeError))
 		close(done)
@@ -58,24 +58,24 @@ var _ = Describe("Csv Tail Storage Fetcher", func() {
 	It("adds parsed csv row to rows channel for storage diff", func(done Done) {
 		line := getFakeLine()
 
-		go storageFetcher.FetchStorageDiffs(rowsChannel, errorsChannel)
+		go storageFetcher.FetchStorageDiffs(diffsChannel, errorsChannel)
 		mockTailer.Lines <- line
 
 		expectedRow, err := utils.FromStrings(strings.Split(line.Text, ","))
 		Expect(err).NotTo(HaveOccurred())
-		Expect(<-rowsChannel).To(Equal(expectedRow))
+		Expect(<-diffsChannel).To(Equal(expectedRow))
 		close(done)
 	})
 
 	It("adds error to errors channel if parsing csv fails", func(done Done) {
 		line := &tail.Line{Text: "invalid"}
 
-		go storageFetcher.FetchStorageDiffs(rowsChannel, errorsChannel)
+		go storageFetcher.FetchStorageDiffs(diffsChannel, errorsChannel)
 		mockTailer.Lines <- line
 
 		Expect(<-errorsChannel).To(HaveOccurred())
 		select {
-		case <-rowsChannel:
+		case <-diffsChannel:
 			Fail("value passed to rows channel on error")
 		default:
 			Succeed()

libraries/shared/fetcher/geth_rpc_storage_fetcher.go

@@ -36,7 +36,7 @@ func NewGethRpcStorageFetcher(streamer streamer.Streamer, statediffPayloadChan c
 	}
 }
 
-func (fetcher *GethRpcStorageFetcher) FetchStorageDiffs(out chan<- utils.StorageDiffRow, errs chan<- error) {
+func (fetcher *GethRpcStorageFetcher) FetchStorageDiffs(out chan<- utils.StorageDiff, errs chan<- error) {
 	ethStatediffPayloadChan := fetcher.statediffPayloadChan
 	clientSubscription, clientSubErr := fetcher.streamer.Stream(ethStatediffPayloadChan)
 	if clientSubErr != nil {
@@ -61,7 +61,7 @@ func (fetcher *GethRpcStorageFetcher) FetchStorageDiffs(out chan<- utils.Storage
 			logrus.Trace(fmt.Sprintf("iterating through %d Storage values on account", len(account.Storage)))
 			for _, storage := range account.Storage {
 				logrus.Trace("adding storage diff to out channel")
-				out <- utils.StorageDiffRow{
+				out <- utils.StorageDiff{
 					Contract:     common.BytesToAddress(account.Key),
 					BlockHash:    stateDiff.BlockHash,
 					BlockHeight:  int(stateDiff.BlockNumber.Int64()),

libraries/shared/fetcher/geth_rpc_storage_fetcher_test.go

@@ -57,21 +57,21 @@ var _ = Describe("Geth RPC Storage Fetcher", func() {
 	var streamer MockStoragediffStreamer
 	var statediffPayloadChan chan statediff.Payload
 	var statediffFetcher fetcher.GethRpcStorageFetcher
-	var storagediffRowChan chan utils.StorageDiffRow
+	var storagediffChan chan utils.StorageDiff
 	var errorChan chan error
 
 	BeforeEach(func() {
 		streamer = MockStoragediffStreamer{}
 		statediffPayloadChan = make(chan statediff.Payload, 1)
 		statediffFetcher = fetcher.NewGethRpcStorageFetcher(&streamer, statediffPayloadChan)
-		storagediffRowChan = make(chan utils.StorageDiffRow)
+		storagediffChan = make(chan utils.StorageDiff)
 		errorChan = make(chan error)
 	})
 
 	It("adds errors to error channel if the RPC subscription fails ", func(done Done) {
 		streamer.SetSubscribeError(fakes.FakeError)
 
-		go statediffFetcher.FetchStorageDiffs(storagediffRowChan, errorChan)
+		go statediffFetcher.FetchStorageDiffs(storagediffChan, errorChan)
 
 		Expect(<-errorChan).To(MatchError(fakes.FakeError))
 		close(done)
@@ -80,7 +80,7 @@ var _ = Describe("Geth RPC Storage Fetcher", func() {
 	It("streams StatediffPayloads from a Geth RPC subscription", func(done Done) {
 		streamer.SetPayloads([]statediff.Payload{test_data.MockStatediffPayload})
 
-		go statediffFetcher.FetchStorageDiffs(storagediffRowChan, errorChan)
+		go statediffFetcher.FetchStorageDiffs(storagediffChan, errorChan)
 
 		streamedPayload := <-statediffPayloadChan
 		Expect(streamedPayload).To(Equal(test_data.MockStatediffPayload))
@@ -91,11 +91,11 @@ var _ = Describe("Geth RPC Storage Fetcher", func() {
 	It("adds parsed statediff payloads to the rows channel", func(done Done) {
 		streamer.SetPayloads([]statediff.Payload{test_data.MockStatediffPayload})
 
-		go statediffFetcher.FetchStorageDiffs(storagediffRowChan, errorChan)
+		go statediffFetcher.FetchStorageDiffs(storagediffChan, errorChan)
 
 		height := test_data.BlockNumber
 		intHeight := int(height.Int64())
-		expectedStorageDiffRow := utils.StorageDiffRow{
+		expectedStorageDiff := utils.StorageDiff{
 			//this is not the contract address, but the keccak 256 of the address
 			Contract:     common.BytesToAddress(test_data.ContractLeafKey[:]),
 			BlockHash:    common.HexToHash("0xfa40fbe2d98d98b3363a778d52f2bcd29d6790b9b3f3cab2b167fd12d3550f73"),
@@ -103,7 +103,7 @@ var _ = Describe("Geth RPC Storage Fetcher", func() {
 			StorageKey:   common.BytesToHash(test_data.StorageKey),
 			StorageValue: common.BytesToHash(test_data.StorageValue),
 		}
-		anotherExpectedStorageDiffRow := utils.StorageDiffRow{
+		anotherExpectedStorageDiff := utils.StorageDiff{
 			//this is not the contract address, but the keccak 256 of the address
 			Contract:     common.BytesToAddress(test_data.AnotherContractLeafKey[:]),
 			BlockHash:    common.HexToHash("0xfa40fbe2d98d98b3363a778d52f2bcd29d6790b9b3f3cab2b167fd12d3550f73"),
@@ -111,8 +111,8 @@ var _ = Describe("Geth RPC Storage Fetcher", func() {
 			StorageKey:   common.BytesToHash(test_data.StorageKey),
 			StorageValue: common.BytesToHash(test_data.StorageValue),
 		}
-		Expect(<-storagediffRowChan).To(Equal(expectedStorageDiffRow))
-		Expect(<-storagediffRowChan).To(Equal(anotherExpectedStorageDiffRow))
+		Expect(<-storagediffChan).To(Equal(expectedStorageDiff))
+		Expect(<-storagediffChan).To(Equal(anotherExpectedStorageDiff))
 
 		close(done)
 	})
@@ -121,7 +121,7 @@ var _ = Describe("Geth RPC Storage Fetcher", func() {
 		badStatediffPayload := statediff.Payload{}
 		streamer.SetPayloads([]statediff.Payload{badStatediffPayload})
 
-		go statediffFetcher.FetchStorageDiffs(storagediffRowChan, errorChan)
+		go statediffFetcher.FetchStorageDiffs(storagediffChan, errorChan)
 
 		Expect(<-errorChan).To(MatchError("EOF"))
 

libraries/shared/fetcher/storage_fetcher_interface.go

@@ -17,5 +17,5 @@ package fetcher
 import "github.com/vulcanize/vulcanizedb/libraries/shared/storage/utils"
 
 type IStorageFetcher interface {
-	FetchStorageDiffs(out chan<- utils.StorageDiffRow, errs chan<- error)
+	FetchStorageDiffs(out chan<- utils.StorageDiff, errs chan<- error)
 }