Extract constants package

- Reduce clutter in the shared package
This commit is contained in:
Rob Mulholand
2018-11-08 13:08:59 -06:00
parent 8c5192f82f
commit 8c168ed332
87 changed files with 604 additions and 542 deletions
+4 -2
View File
@@ -20,10 +20,12 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/vulcanize/vulcanizedb/pkg/geth"
"github.com/vulcanize/vulcanizedb/pkg/transformers/bite"
"github.com/vulcanize/vulcanizedb/pkg/transformers/factories"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants"
"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data"
"github.com/vulcanize/vulcanizedb/test_config"
)
@@ -71,8 +73,8 @@ var _ = Describe("Bite Transformer", func() {
})
It("unpacks an event log", func() {
address := common.HexToAddress(shared.CatContractAddress)
abi, err := geth.ParseAbi(shared.CatABI)
address := common.HexToAddress(constants.CatContractAddress)
abi, err := geth.ParseAbi(constants.CatABI)
Expect(err).NotTo(HaveOccurred())
contract := bind.NewBoundContract(address, abi, nil, nil, nil)
+4 -3
View File
@@ -18,13 +18,14 @@ import (
"github.com/ethereum/go-ethereum/ethclient"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/vulcanize/vulcanizedb/pkg/transformers/factories"
"github.com/vulcanize/vulcanizedb/pkg/core"
"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres"
"github.com/vulcanize/vulcanizedb/pkg/geth/client"
"github.com/vulcanize/vulcanizedb/pkg/transformers/deal"
"github.com/vulcanize/vulcanizedb/pkg/transformers/factories"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants"
"github.com/vulcanize/vulcanizedb/test_config"
)
@@ -72,7 +73,7 @@ var _ = Describe("Deal transformer", func() {
Expect(len(dbResult)).To(Equal(1))
Expect(dbResult[0].BidId).To(Equal("6"))
Expect(dbResult[0].ContractAddress).To(Equal(shared.FlipperContractAddress))
Expect(dbResult[0].ContractAddress).To(Equal(constants.FlipperContractAddress))
})
It("persists a flop deal log event", func() {
@@ -104,6 +105,6 @@ var _ = Describe("Deal transformer", func() {
Expect(len(dbResult)).To(Equal(1))
Expect(dbResult[0].BidId).To(Equal("1"))
Expect(dbResult[0].ContractAddress).To(Equal(shared.FlapperContractAddress))
Expect(dbResult[0].ContractAddress).To(Equal(constants.FlapperContractAddress))
})
})
@@ -15,24 +15,26 @@
package integration_tests
import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"time"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/vulcanize/vulcanizedb/pkg/geth"
"github.com/vulcanize/vulcanizedb/pkg/transformers/factories"
"github.com/vulcanize/vulcanizedb/pkg/transformers/flip_kick"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants"
"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data"
"github.com/vulcanize/vulcanizedb/test_config"
"time"
)
var _ = Describe("FlipKick Transformer", func() {
It("unpacks an event log", func() {
address := common.HexToAddress(shared.FlipperContractAddress)
abi, err := geth.ParseAbi(shared.FlipperABI)
address := common.HexToAddress(constants.FlipperContractAddress)
abi, err := geth.ParseAbi(constants.FlipperABI)
Expect(err).NotTo(HaveOccurred())
contract := bind.NewBoundContract(address, abi, nil, nil, nil)
@@ -17,12 +17,17 @@ package integration_tests
import (
"time"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/vulcanize/vulcanizedb/pkg/geth"
"github.com/vulcanize/vulcanizedb/pkg/transformers/factories"
"github.com/vulcanize/vulcanizedb/pkg/transformers/flop_kick"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants"
"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data"
"github.com/vulcanize/vulcanizedb/test_config"
)
@@ -105,4 +110,25 @@ var _ = Describe("FlopKick Transformer", func() {
Expect(dbResult[0].Gal).To(Equal("0x3728e9777B2a0a611ee0F89e00E01044ce4736d1"))
Expect(dbResult[0].Lot).To(Equal("115792089237316195423570985008687907853269984665640564039457584007913129639935"))
})
It("unpacks an flop kick event log", func() {
address := common.HexToAddress(constants.FlopperContractAddress)
abi, err := geth.ParseAbi(constants.FlopperABI)
Expect(err).NotTo(HaveOccurred())
contract := bind.NewBoundContract(address, abi, nil, nil, nil)
entity := &flop_kick.Entity{}
var eventLog = test_data.FlopKickLog
err = contract.UnpackLog(entity, "Kick", eventLog)
Expect(err).NotTo(HaveOccurred())
expectedEntity := test_data.FlopKickEntity
Expect(entity.Id).To(Equal(expectedEntity.Id))
Expect(entity.Lot).To(Equal(expectedEntity.Lot))
Expect(entity.Bid).To(Equal(expectedEntity.Bid))
Expect(entity.Gal).To(Equal(expectedEntity.Gal))
Expect(entity.End).To(Equal(expectedEntity.End))
})
})
+3 -2
View File
@@ -24,6 +24,7 @@ import (
"github.com/vulcanize/vulcanizedb/pkg/transformers/factories"
"github.com/vulcanize/vulcanizedb/pkg/transformers/frob"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants"
"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data"
"github.com/vulcanize/vulcanizedb/test_config"
)
@@ -71,8 +72,8 @@ var _ = Describe("Frob Transformer", func() {
})
It("unpacks an event log", func() {
address := common.HexToAddress(shared.PitContractAddress)
abi, err := geth.ParseAbi(shared.PitABI)
address := common.HexToAddress(constants.PitContractAddress)
abi, err := geth.ParseAbi(constants.PitABI)
Expect(err).NotTo(HaveOccurred())
contract := bind.NewBoundContract(address, abi, nil, nil, nil)
@@ -23,6 +23,7 @@ import (
"github.com/vulcanize/vulcanizedb/pkg/transformers/factories"
"github.com/vulcanize/vulcanizedb/pkg/transformers/price_feeds"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants"
"github.com/vulcanize/vulcanizedb/test_config"
)
@@ -46,7 +47,7 @@ var _ = Describe("Price feeds transformer", func() {
err := persistHeader(db, blockNumber)
Expect(err).NotTo(HaveOccurred())
config := price_feeds.PriceFeedConfig
config.ContractAddresses = []string{shared.PipContractAddress}
config.ContractAddresses = []string{constants.PipContractAddress}
config.StartingBlockNumber = blockNumber
config.EndingBlockNumber = blockNumber
@@ -73,7 +74,7 @@ var _ = Describe("Price feeds transformer", func() {
err := persistHeader(db, blockNumber)
Expect(err).NotTo(HaveOccurred())
config := price_feeds.PriceFeedConfig
config.ContractAddresses = []string{shared.PepContractAddress}
config.ContractAddresses = []string{constants.PepContractAddress}
config.StartingBlockNumber = blockNumber
config.EndingBlockNumber = blockNumber
@@ -100,7 +101,7 @@ var _ = Describe("Price feeds transformer", func() {
err := persistHeader(db, blockNumber)
Expect(err).NotTo(HaveOccurred())
config := price_feeds.PriceFeedConfig
config.ContractAddresses = []string{shared.RepContractAddress}
config.ContractAddresses = []string{constants.RepContractAddress}
config.StartingBlockNumber = blockNumber
config.EndingBlockNumber = blockNumber