From 0ce3e3d82904561908cc8f7f638c3627c1cb139d Mon Sep 17 00:00:00 2001 From: Rob Mulholand Date: Thu, 18 Oct 2018 11:35:27 -0500 Subject: [PATCH] Add Bite integration test --- pkg/transformers/bite/converter.go | 5 +- pkg/transformers/bite/converter_test.go | 2 +- pkg/transformers/integration_tests/bite.go | 61 ++++++++++++++++++++++ pkg/transformers/test_data/bite.go | 12 ++--- 4 files changed, 71 insertions(+), 9 deletions(-) create mode 100644 pkg/transformers/integration_tests/bite.go diff --git a/pkg/transformers/bite/converter.go b/pkg/transformers/bite/converter.go index 1de4b269..6df68c83 100644 --- a/pkg/transformers/bite/converter.go +++ b/pkg/transformers/bite/converter.go @@ -17,6 +17,7 @@ package bite import ( + "bytes" "encoding/json" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" @@ -61,8 +62,8 @@ func (BiteConverter) ToEntities(contractAbi string, ethLogs []types.Log) ([]Bite func (converter BiteConverter) ToModels(entities []BiteEntity) ([]BiteModel, error) { var models []BiteModel for _, entity := range entities { - ilk := common.BytesToAddress(entity.Ilk[:common.AddressLength]).String() - urn := common.BytesToAddress(entity.Urn[:common.AddressLength]).String() + ilk := string(bytes.Trim(entity.Ilk[:], "\x00")) + urn := common.BytesToAddress(entity.Urn[:]).String() ink := entity.Ink art := entity.Art iArt := entity.IArt diff --git a/pkg/transformers/bite/converter_test.go b/pkg/transformers/bite/converter_test.go index 1ca9a9bc..3c42bdb4 100644 --- a/pkg/transformers/bite/converter_test.go +++ b/pkg/transformers/bite/converter_test.go @@ -71,7 +71,7 @@ var _ = Describe("Bite Converter", func() { emptyLog, err := json.Marshal(types.Log{}) Expect(err).NotTo(HaveOccurred()) expectedModel := bite.BiteModel{ - Ilk: "0x0000000000000000000000000000000000000000", + Ilk: "", Urn: "0x0000000000000000000000000000000000000000", Ink: "", Art: "", diff --git a/pkg/transformers/integration_tests/bite.go b/pkg/transformers/integration_tests/bite.go new file mode 100644 index 00000000..247b9e56 --- /dev/null +++ b/pkg/transformers/integration_tests/bite.go @@ -0,0 +1,61 @@ +// 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/onsi/ginkgo" + . "github.com/onsi/gomega" + + "github.com/vulcanize/vulcanizedb/pkg/transformers/bite" + "github.com/vulcanize/vulcanizedb/test_config" +) + +var _ = Describe("Bite Transformer", func() { + It("fetches and transforms a Bite event from Kovan chain", func() { + blockNumber := int64(8956422) + config := bite.BiteConfig + 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 := bite.BiteTransformerInitializer{Config: config} + transformer := initializer.NewBiteTransformer(db, blockchain) + err = transformer.Execute() + Expect(err).NotTo(HaveOccurred()) + + var dbResult []bite.BiteModel + err = db.Select(&dbResult, `SELECT art, iart, ilk, ink, nflip, tab, urn from maker.bite`) + Expect(err).NotTo(HaveOccurred()) + + Expect(len(dbResult)).To(Equal(1)) + Expect(dbResult[0].Art).To(Equal("149846666666666655744")) + Expect(dbResult[0].IArt).To(Equal("1645356666666666655736")) + Expect(dbResult[0].Ilk).To(Equal("ETH")) + Expect(dbResult[0].Ink).To(Equal("1000000000000000000")) + Expect(dbResult[0].NFlip).To(Equal("2")) + Expect(dbResult[0].Tab).To(Equal("149846666666666655744")) + Expect(dbResult[0].Urn).To(Equal("0x0000d8b4147eDa80Fec7122AE16DA2479Cbd7ffB")) + }) +}) diff --git a/pkg/transformers/test_data/bite.go b/pkg/transformers/test_data/bite.go index 35b3c693..9b2da2e6 100644 --- a/pkg/transformers/test_data/bite.go +++ b/pkg/transformers/test_data/bite.go @@ -39,18 +39,18 @@ var ( biteIArt = big.NewInt(5) biteRawJson, _ = json.Marshal(EthBiteLog) biteRawString = string(biteRawJson) - biteIlk = [32]byte{102, 97, 107, 101, 32, 105, 108, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} - biteLad = [32]byte{102, 97, 107, 101, 32, 108, 97, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} - biteIlkString = "0x66616b6520696c6B000000000000000000000000" - biteLadString = "0x66616B65206c6164000000000000000000000000" + biteIlk = [32]byte{69, 84, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} + biteLad = [32]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 216, 180, 20, 126, 218, 128, 254, 199, 18, 42, 225, 109, 162, 71, 156, 189, 127, 251} + biteIlkString = "ETH" + biteLadString = "0x0000d8b4147eDa80Fec7122AE16DA2479Cbd7ffB" ) var EthBiteLog = types.Log{ Address: common.HexToAddress(shared.CatContractAddress), Topics: []common.Hash{ common.HexToHash("0x99b5620489b6ef926d4518936cfec15d305452712b88bd59da2d9c10fb0953e8"), - common.HexToHash("0x66616b6520696c6b000000000000000000000000000000000000000000000000"), - common.HexToHash("0x66616b65206c6164000000000000000000000000000000000000000000000000"), + common.HexToHash("0x4554480000000000000000000000000000000000000000000000000000000000"), + common.HexToHash("0x0000000000000000000000000000d8b4147eda80fec7122ae16da2479cbd7ffb"), }, Data: hexutil.MustDecode(TemporaryBiteData), BlockNumber: uint64(TemporaryBiteBlockNumber),