From 677e78891d2d5e23c6b325578cfc96dfbcf9df00 Mon Sep 17 00:00:00 2001 From: Rob Mulholand Date: Thu, 18 Oct 2018 13:03:19 -0500 Subject: [PATCH] Add Drip file vow integration test --- pkg/transformers/drip_file/vow/converter.go | 3 +- .../integration_tests/drip_file_vow.go | 57 +++++++++++++++++++ pkg/transformers/test_data/drip_file.go | 8 +-- 3 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 pkg/transformers/integration_tests/drip_file_vow.go diff --git a/pkg/transformers/drip_file/vow/converter.go b/pkg/transformers/drip_file/vow/converter.go index dc2d442b..082f6c88 100644 --- a/pkg/transformers/drip_file/vow/converter.go +++ b/pkg/transformers/drip_file/vow/converter.go @@ -18,6 +18,7 @@ import ( "bytes" "encoding/json" "errors" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" ) @@ -35,7 +36,7 @@ func (DripFileVowConverter) ToModels(ethLogs []types.Log) ([]DripFileVowModel, e return nil, err } what := string(bytes.Trim(ethLog.Topics[2].Bytes(), "\x00")) - data := string(bytes.Trim(ethLog.Topics[3].Bytes(), "\x00")) + data := common.BytesToAddress(ethLog.Topics[3].Bytes()).String() raw, err := json.Marshal(ethLog) if err != nil { return nil, err diff --git a/pkg/transformers/integration_tests/drip_file_vow.go b/pkg/transformers/integration_tests/drip_file_vow.go new file mode 100644 index 00000000..7a849410 --- /dev/null +++ b/pkg/transformers/integration_tests/drip_file_vow.go @@ -0,0 +1,57 @@ +// 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/drip_file" + "github.com/vulcanize/vulcanizedb/pkg/transformers/drip_file/vow" + "github.com/vulcanize/vulcanizedb/test_config" +) + +var _ = Describe("Drip File Vow Transformer", func() { + It("transforms DripFileVow log events", func() { + blockNumber := int64(8762197) + config := drip_file.DripFileConfig + 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 := vow.DripFileVowTransformerInitializer{Config: config} + transformer := initializer.NewDripFileVowTransformer(db, blockchain) + err = transformer.Execute() + Expect(err).NotTo(HaveOccurred()) + + var dbResult []vow.DripFileVowModel + err = db.Select(&dbResult, `SELECT what, data FROM maker.drip_file_vow`) + Expect(err).NotTo(HaveOccurred()) + + Expect(len(dbResult)).To(Equal(1)) + Expect(dbResult[0].What).To(Equal("vow")) + Expect(dbResult[0].Data).To(Equal("0x3728e9777B2a0a611ee0F89e00E01044ce4736d1")) + }) +}) diff --git a/pkg/transformers/test_data/drip_file.go b/pkg/transformers/test_data/drip_file.go index d434eea0..f429bd2b 100644 --- a/pkg/transformers/test_data/drip_file.go +++ b/pkg/transformers/test_data/drip_file.go @@ -82,8 +82,8 @@ var EthDripFileVowLog = types.Log{ Topics: []common.Hash{ common.HexToHash("0xe9b674b900000000000000000000000000000000000000000000000000000000"), common.HexToHash("0x00000000000000000000000064d922894153be9eef7b7218dc565d1d0ce2a092"), - common.HexToHash("0x66616b6520776861740000000000000000000000000000000000000000000000"), - common.HexToHash("0x66616b6520646174610000000000000000000000000000000000000000000000"), + common.HexToHash("0x766f770000000000000000000000000000000000000000000000000000000000"), + common.HexToHash("0x0000000000000000000000003728e9777b2a0a611ee0f89e00e01044ce4736d1"), }, Data: hexutil.MustDecode("0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000044e9b674b966616b652077686174000000000000000000000000000000000000000000000066616b6520646174610000000000000000000000000000000000000000000000"), BlockNumber: 51, @@ -96,8 +96,8 @@ var EthDripFileVowLog = types.Log{ var rawDripFileVowLog, _ = json.Marshal(EthDripFileVowLog) var DripFileVowModel = vow.DripFileVowModel{ - What: "fake what", - Data: "fake data", + What: "vow", + Data: "0x3728e9777B2a0a611ee0F89e00E01044ce4736d1", TransactionIndex: EthDripFileVowLog.TxIndex, Raw: rawDripFileVowLog, }