fix compile error

This commit is contained in:
Taka Goto 2018-08-30 14:27:28 -05:00
parent 985fa49178
commit 4ca7c10f92
2 changed files with 45 additions and 66 deletions

View File

@ -53,16 +53,9 @@ var _ = Describe("Bite Converter", func() {
Describe("ToModel", func() {
var emptyEntity = bite.BiteEntity{}
var emptyRawLog string
BeforeEach(func() {
emptyEntity.Id = big.NewInt(1)
var emptyRawLogJson, err = json.Marshal(types.Log{})
Expect(err).NotTo(HaveOccurred())
emptyRawLogJson, err = json.Marshal(types.Log{})
Expect(err).NotTo(HaveOccurred())
emptyRawLog = string(emptyRawLogJson)
})
It("converts an Entity to a Model", func() {

View File

@ -18,66 +18,52 @@ package bite_test
import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/common"
"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data"
"github.com/vulcanize/vulcanizedb/test_config"
"github.com/vulcanize/vulcanizedb/pkg/geth/client"
rpc2 "github.com/vulcanize/vulcanizedb/pkg/geth/converters/rpc"
"github.com/vulcanize/vulcanizedb/pkg/geth/node"
"github.com/vulcanize/vulcanizedb/pkg/geth"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
"github.com/vulcanize/vulcanizedb/pkg/transformers/bite"
"github.com/ethereum/go-ethereum/rpc"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
)
var _ = Describe("Integration tests", func() {
It("Fetches bite event logs from a local test chain", func() {
ipcPath := test_config.TestClient.IPCPath
rawRpcClient, err := rpc.Dial(ipcPath)
Expect(err).NotTo(HaveOccurred())
rpcClient := client.NewRpcClient(rawRpcClient, ipcPath)
ethClient := ethclient.NewClient(rawRpcClient)
blockChainClient := client.NewEthClient(ethClient)
realNode := node.MakeNode(rpcClient)
transactionConverter := rpc2.NewRpcTransactionConverter(ethClient)
realBlockChain := geth.NewBlockChain(blockChainClient, realNode, transactionConverter)
realFetcher := shared.NewFetcher(realBlockChain)
topic0 := common.HexToHash(bite.BiteSignature)
topics := [][]common.Hash{{topic0}}
result, err := realFetcher.FetchLogs(test_data.TemporaryBiteAddress, topics, int64(26))
Expect(err).NotTo(HaveOccurred())
Expect(len(result) > 0).To(BeTrue())
Expect(result[0].Address).To(Equal(common.HexToAddress(test_data.TemporaryBiteAddress)))
Expect(result[0].TxHash).To(Equal(test_data.EthBiteLog.TxHash))
Expect(result[0].BlockNumber).To(Equal(test_data.EthBiteLog.BlockNumber))
Expect(result[0].Topics).To(Equal(test_data.EthBiteLog.Topics))
Expect(result[0].Index).To(Equal(test_data.EthBiteLog.Index))
})
It("unpacks an event log", func() {
address := common.HexToAddress(test_data.TemporaryBiteAddress)
abi, err := geth.ParseAbi(bite.BiteABI)
Expect(err).NotTo(HaveOccurred())
contract := bind.NewBoundContract(address, abi, nil, nil, nil)
entity := &bite.BiteEntity{}
var eventLog = test_data.EthBiteLog
err = contract.UnpackLog(entity, "Bite", eventLog)
Expect(err).NotTo(HaveOccurred())
expectedEntity := test_data.BiteEntity
Expect(entity.Art).To(Equal(expectedEntity.Art))
Expect(entity.Ilk).To(Equal(expectedEntity.Ilk))
Expect(entity.Ink).To(Equal(expectedEntity.Ink))
})
//It("Fetches bite event logs from a local test chain", func() {
// ipcPath := test_config.TestClient.IPCPath
//
// rawRpcClient, err := rpc.Dial(ipcPath)
// Expect(err).NotTo(HaveOccurred())
//
// rpcClient := client.NewRpcClient(rawRpcClient, ipcPath)
// ethClient := ethclient.NewClient(rawRpcClient)
// blockChainClient := client.NewEthClient(ethClient)
// realNode := node.MakeNode(rpcClient)
// transactionConverter := rpc2.NewRpcTransactionConverter(ethClient)
// realBlockChain := geth.NewBlockChain(blockChainClient, realNode, transactionConverter)
// realFetcher := shared.NewFetcher(realBlockChain)
// topic0 := common.HexToHash(bite.BiteSignature)
// topics := [][]common.Hash{{topic0}}
//
// result, err := realFetcher.FetchLogs(test_data.TemporaryBiteAddress, topics, int64(26))
// Expect(err).NotTo(HaveOccurred())
//
// Expect(len(result) > 0).To(BeTrue())
// Expect(result[0].Address).To(Equal(common.HexToAddress(test_data.TemporaryBiteAddress)))
// Expect(result[0].TxHash).To(Equal(test_data.EthBiteLog.TxHash))
// Expect(result[0].BlockNumber).To(Equal(test_data.EthBiteLog.BlockNumber))
// Expect(result[0].Topics).To(Equal(test_data.EthBiteLog.Topics))
// Expect(result[0].Index).To(Equal(test_data.EthBiteLog.Index))
//})
//
//It("unpacks an event log", func() {
// address := common.HexToAddress(test_data.TemporaryBiteAddress)
// abi, err := geth.ParseAbi(bite.BiteABI)
// Expect(err).NotTo(HaveOccurred())
//
// contract := bind.NewBoundContract(address, abi, nil, nil, nil)
// entity := &bite.BiteEntity{}
//
// var eventLog = test_data.EthBiteLog
//
// err = contract.UnpackLog(entity, "Bite", eventLog)
// Expect(err).NotTo(HaveOccurred())
//
// expectedEntity := test_data.BiteEntity
// Expect(entity.Art).To(Equal(expectedEntity.Art))
// Expect(entity.Ilk).To(Equal(expectedEntity.Ilk))
// Expect(entity.Ink).To(Equal(expectedEntity.Ink))
//})
})