Flop deal (#39)
*Refactor deal transformer to take in several contract addresses * Add flop address to deal transformer
This commit is contained in:
@@ -21,7 +21,7 @@ import (
|
||||
)
|
||||
|
||||
var BiteConfig = shared.TransformerConfig{
|
||||
ContractAddress: shared.CatContractAddress,
|
||||
ContractAddresses: []string{shared.CatContractAddress},
|
||||
ContractAbi: shared.CatABI,
|
||||
Topics: []string{shared.BiteSignature},
|
||||
StartingBlockNumber: 0,
|
||||
|
||||
@@ -51,7 +51,7 @@ var _ = Describe("Integration tests", func() {
|
||||
topic0 := common.HexToHash(shared.BiteSignature)
|
||||
topics := [][]common.Hash{{topic0}}
|
||||
|
||||
result, err := realFetcher.FetchLogs(shared.CatContractAddress, topics, int64(26))
|
||||
result, err := realFetcher.FetchLogs(bite.BiteConfig.ContractAddresses, topics, int64(26))
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
|
||||
Expect(len(result) > 0).To(BeTrue())
|
||||
|
||||
@@ -62,14 +62,14 @@ func (b BiteTransformer) Execute() error {
|
||||
|
||||
log.Printf("Fetching bite event logs for %d headers \n", len(missingHeaders))
|
||||
for _, header := range missingHeaders {
|
||||
ethLogs, err := b.Fetcher.FetchLogs(config.ContractAddress, topics, header.BlockNumber)
|
||||
ethLogs, err := b.Fetcher.FetchLogs(config.ContractAddresses, topics, header.BlockNumber)
|
||||
if err != nil {
|
||||
log.Println("Error fetching matching logs:", err)
|
||||
return err
|
||||
}
|
||||
|
||||
for _, ethLog := range ethLogs {
|
||||
entity, err := b.Converter.ToEntity(config.ContractAddress, config.ContractAbi, ethLog)
|
||||
entity, err := b.Converter.ToEntity(ethLog.Address.Hex(), config.ContractAbi, ethLog)
|
||||
model, err := b.Converter.ToModel(entity)
|
||||
if err != nil {
|
||||
log.Println("Error converting logs:", err)
|
||||
|
||||
@@ -38,7 +38,6 @@ var _ = Describe("Bite Transformer", func() {
|
||||
var transformer bite.BiteTransformer
|
||||
var blockNumber1 = rand.Int63()
|
||||
var blockNumber2 = rand.Int63()
|
||||
var testConfig shared.TransformerConfig
|
||||
|
||||
BeforeEach(func() {
|
||||
repository = bite_mocks.MockBiteRepository{}
|
||||
@@ -52,14 +51,7 @@ var _ = Describe("Bite Transformer", func() {
|
||||
Config: bite.BiteConfig,
|
||||
}
|
||||
|
||||
testConfig = shared.TransformerConfig{
|
||||
ContractAddress: "0x12345",
|
||||
ContractAbi: "test abi",
|
||||
Topics: []string{shared.BiteSignature},
|
||||
StartingBlockNumber: blockNumber1,
|
||||
EndingBlockNumber: blockNumber2,
|
||||
}
|
||||
transformer.SetConfig(testConfig)
|
||||
transformer.SetConfig(bite.BiteConfig)
|
||||
})
|
||||
|
||||
It("gets missing headers for blocks in the configured range", func() {
|
||||
@@ -85,7 +77,7 @@ var _ = Describe("Bite Transformer", func() {
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
Expect(fetcher.FetchedBlocks).To(Equal([]int64{blockNumber1, blockNumber2}))
|
||||
Expect(fetcher.FetchedTopics).To(Equal(expectedTopics))
|
||||
Expect(fetcher.FetchedContractAddress).To(Equal(bite.BiteConfig.ContractAddress))
|
||||
Expect(fetcher.FetchedContractAddresses).To(Equal([][]string{bite.BiteConfig.ContractAddresses, bite.BiteConfig.ContractAddresses}))
|
||||
})
|
||||
|
||||
It("returns an error if fetching logs fails", func() {
|
||||
@@ -103,7 +95,7 @@ var _ = Describe("Bite Transformer", func() {
|
||||
err := transformer.Execute()
|
||||
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
Expect(converter.ConverterContract).To(Equal(bite.BiteConfig.ContractAddress))
|
||||
Expect(converter.ConverterContract).To(Equal(test_data.EthBiteLog.Address.Hex()))
|
||||
Expect(converter.ConverterAbi).To(Equal(bite.BiteConfig.ContractAbi))
|
||||
Expect(converter.LogsToConvert).To(Equal([]types.Log{test_data.EthBiteLog}))
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user