From 9b427ea1e9ea3797f4410a8a2ed64722d6cd5d18 Mon Sep 17 00:00:00 2001
From: Rob Mulholand <rmulholand@8thlight.com>
Date: Wed, 17 Oct 2018 15:26:06 -0500
Subject: [PATCH] Add Vat move integration test

---
 cmd/getSignatures.go                          |  1 +
 .../integration_tests/vat_move.go             | 59 +++++++++++++++++++
 pkg/transformers/test_data/vat_move.go        |  4 +-
 pkg/transformers/vat_move/converter.go        |  4 +-
 4 files changed, 64 insertions(+), 4 deletions(-)
 create mode 100644 pkg/transformers/integration_tests/vat_move.go

diff --git a/cmd/getSignatures.go b/cmd/getSignatures.go
index 0be2ccd5..796978c1 100644
--- a/cmd/getSignatures.go
+++ b/cmd/getSignatures.go
@@ -56,6 +56,7 @@ func getSignatures() {
 	signatures["VatInitSignature"] = shared.VatInitSignature
 	signatures["VatFluxSignature"] = shared.VatFluxSignature
 	signatures["VatFoldSignature"] = shared.VatFoldSignature
+	signatures["VatMoveSignature"] = shared.VatMoveSignature
 	signatures["VatSlipSignature"] = shared.VatSlipSignature
 	signatures["VatTollSignature"] = shared.VatTollSignature
 	signatures["VatTuneSignature"] = shared.VatTuneSignature
diff --git a/pkg/transformers/integration_tests/vat_move.go b/pkg/transformers/integration_tests/vat_move.go
new file mode 100644
index 00000000..7f93985e
--- /dev/null
+++ b/pkg/transformers/integration_tests/vat_move.go
@@ -0,0 +1,59 @@
+// 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 integration_tests
+
+import (
+	"github.com/ethereum/go-ethereum/common"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"github.com/vulcanize/vulcanizedb/pkg/transformers/vat_move"
+	"github.com/vulcanize/vulcanizedb/test_config"
+)
+
+var _ = Describe("VatMove Transformer", func() {
+	It("transforms VatMove log events", func() {
+		blockNumber := int64(9004628)
+		config := vat_move.VatMoveConfig
+		config.StartingBlockNumber = blockNumber
+		config.EndingBlockNumber = blockNumber
+
+		rpcClient, ethClient, err := getClients(ipc)
+		Expect(err).NotTo(HaveOccurred())
+		blockchain, err := getBlockChain(rpcClient, ethClient)
+		Expect(err).NotTo(HaveOccurred())
+
+		db := test_config.NewTestDB(blockchain.Node())
+		test_config.CleanTestDB(db)
+
+		err = persistHeader(rpcClient, db, blockNumber)
+		Expect(err).NotTo(HaveOccurred())
+
+		initializer := vat_move.VatMoveTransformerInitializer{Config: config}
+		transformer := initializer.NewVatMoveTransformer(db, blockchain)
+		err = transformer.Execute()
+		Expect(err).NotTo(HaveOccurred())
+
+		var dbResults []vat_move.VatMoveModel
+		err = db.Select(&dbResults, `SELECT src, dst, rad from maker.vat_move`)
+		Expect(err).NotTo(HaveOccurred())
+
+		Expect(len(dbResults)).To(Equal(1))
+		dbResult := dbResults[0]
+		Expect(dbResult.Src).To(Equal(common.HexToAddress("0x8868bad8e74fca4505676d1b5b21ecc23328d132").String()))
+		Expect(dbResult.Dst).To(Equal(common.HexToAddress("0x0000d8b4147eda80fec7122ae16da2479cbd7ffb").String()))
+		Expect(dbResult.Rad).To(Equal("1000000000000000000000000000000000000000000000"))
+	})
+})
diff --git a/pkg/transformers/test_data/vat_move.go b/pkg/transformers/test_data/vat_move.go
index bd91cb4e..cb474f70 100644
--- a/pkg/transformers/test_data/vat_move.go
+++ b/pkg/transformers/test_data/vat_move.go
@@ -29,8 +29,8 @@ var EthVatMoveLog = types.Log{
 	Address: common.HexToAddress(shared.VatContractAddress),
 	Topics: []common.Hash{
 		common.HexToHash("0x78f1947000000000000000000000000000000000000000000000000000000000"),
-		common.HexToHash("0xa730d1ff8b6bc74a26d54c20a9dda539909bab0e000000000000000000000000"),
-		common.HexToHash("0xb730d1ff8b6bc74a26d54c20a9dda539909bab0e000000000000000000000000"),
+		common.HexToHash("0x000000000000000000000000a730d1ff8b6bc74a26d54c20a9dda539909bab0e"),
+		common.HexToHash("0x000000000000000000000000b730d1ff8b6bc74a26d54c20a9dda539909bab0e"),
 		common.HexToHash("0x000000000000000000000000000000000000000000000000000000000000002a"),
 	},
 	Data:        hexutil.MustDecode("0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006478f19470a730d1ff8b6bc74a26d54c20a9dda539909bab0e000000000000000000000000b730d1ff8b6bc74a26d54c20a9dda539909bab0e000000000000000000000000000000000000000000000000000000000000000000000000000000000000002a"),
diff --git a/pkg/transformers/vat_move/converter.go b/pkg/transformers/vat_move/converter.go
index 528dcc3c..c28aa71a 100644
--- a/pkg/transformers/vat_move/converter.go
+++ b/pkg/transformers/vat_move/converter.go
@@ -35,8 +35,8 @@ func (VatMoveConverter) ToModels(ethLogs []types.Log) ([]VatMoveModel, error) {
 			return []VatMoveModel{}, err
 		}
 
-		src := common.BytesToAddress(ethLog.Topics[1].Bytes()[:common.AddressLength])
-		dst := common.BytesToAddress(ethLog.Topics[2].Bytes()[:common.AddressLength])
+		src := common.BytesToAddress(ethLog.Topics[1].Bytes())
+		dst := common.BytesToAddress(ethLog.Topics[2].Bytes())
 		rad := ethLog.Topics[3].Big()
 		raw, err := json.Marshal(ethLog)
 		if err != nil {