Merge branch 'staging' into pub_merge
This commit is contained in:
Ian Norden
GitHub
+28
-28
@@ -88,34 +88,34 @@ func getTransformerInitializers(transformerNames []string) []shared2.Transformer
|
||||
func buildTransformerInitializerMap() map[string]shared2.TransformerInitializer {
|
||||
initializerMap := make(map[string]shared2.TransformerInitializer)
|
||||
|
||||
initializerMap[constants.BiteLabel] = transformers.BiteTransformer.NewTransformer
|
||||
initializerMap[constants.CatFileChopLumpLabel] = transformers.CatFileChopLumpTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.CatFileFlipLabel] = transformers.CatFileFlipTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.CatFilePitVowLabel] = transformers.CatFilePitVowTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.DealLabel] = transformers.DealTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.DentLabel] = transformers.DentTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.DripDripLabel] = transformers.DripDripTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.DripFileIlkLabel] = transformers.DripFileIlkTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.DripFileRepoLabel] = transformers.DripFileRepoTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.DripFileVowLabel] = transformers.DripFileVowTransfromer.NewLogNoteTransformer
|
||||
initializerMap[constants.FlapKickLabel] = transformers.FlapKickTransformer.NewTransformer
|
||||
initializerMap[constants.FlipKickLabel] = transformers.FlipKickTransformer.NewTransformer
|
||||
initializerMap[constants.FlopKickLabel] = transformers.FlopKickTransformer.NewTransformer
|
||||
initializerMap[constants.FrobLabel] = transformers.FrobTransformer.NewTransformer
|
||||
initializerMap[constants.PitFileDebtCeilingLabel] = transformers.PitFileDebtCeilingTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.PitFileIlkLabel] = transformers.PitFileIlkTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.PriceFeedLabel] = transformers.PriceFeedTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.TendLabel] = transformers.TendTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.VatFluxLabel] = transformers.VatFluxTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.VatFoldLabel] = transformers.VatFoldTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.VatGrabLabel] = transformers.VatGrabTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.VatHealLabel] = transformers.VatHealTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.VatInitLabel] = transformers.VatInitTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.VatMoveLabel] = transformers.VatMoveTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.VatSlipLabel] = transformers.VatSlipTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.VatTollLabel] = transformers.VatTollTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.VatTuneLabel] = transformers.VatTuneTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.VowFlogLabel] = transformers.FlogTransformer.NewLogNoteTransformer
|
||||
initializerMap[constants.BiteLabel] = transformers.GetBiteTransformer().NewTransformer
|
||||
initializerMap[constants.CatFileChopLumpLabel] = transformers.GetCatFileChopLumpTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.CatFileFlipLabel] = transformers.GetCatFileFlipTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.CatFilePitVowLabel] = transformers.GetCatFilePitVowTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.DealLabel] = transformers.GetDealTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.DentLabel] = transformers.GetDentTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.DripDripLabel] = transformers.GetDripDripTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.DripFileIlkLabel] = transformers.GetDripFileIlkTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.DripFileRepoLabel] = transformers.GetDripFileRepoTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.DripFileVowLabel] = transformers.GetDripFileVowTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.FlapKickLabel] = transformers.GetFlapKickTransformer().NewTransformer
|
||||
initializerMap[constants.FlipKickLabel] = transformers.GetFlipKickTransformer().NewTransformer
|
||||
initializerMap[constants.FlopKickLabel] = transformers.GetFlopKickTransformer().NewTransformer
|
||||
initializerMap[constants.FrobLabel] = transformers.GetFrobTransformer().NewTransformer
|
||||
initializerMap[constants.PitFileDebtCeilingLabel] = transformers.GetPitFileDebtCeilingTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.PitFileIlkLabel] = transformers.GetPitFileIlkTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.PriceFeedLabel] = transformers.GetPriceFeedTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.TendLabel] = transformers.GetTendTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.VatFluxLabel] = transformers.GetVatFluxTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.VatFoldLabel] = transformers.GetVatFoldTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.VatGrabLabel] = transformers.GetVatGrabTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.VatHealLabel] = transformers.GetVatHealTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.VatInitLabel] = transformers.GetVatInitTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.VatMoveLabel] = transformers.GetVatMoveTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.VatSlipLabel] = transformers.GetVatSlipTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.VatTollLabel] = transformers.GetVatTollTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.VatTuneLabel] = transformers.GetVatTuneTransformer().NewLogNoteTransformer
|
||||
initializerMap[constants.VowFlogLabel] = transformers.GetFlogTransformer().NewLogNoteTransformer
|
||||
|
||||
return initializerMap
|
||||
}
|
||||
|
||||
+30
-30
@@ -15,7 +15,7 @@
|
||||
package cmd
|
||||
|
||||
import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"fmt"
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants"
|
||||
)
|
||||
@@ -33,37 +33,37 @@ vulcanizedb getSignatures`,
|
||||
|
||||
func getSignatures() {
|
||||
signatures := make(map[string]string)
|
||||
signatures["BiteSignature"] = constants.BiteSignature
|
||||
signatures["CatFileChopLumpSignature"] = constants.CatFileChopLumpSignature
|
||||
signatures["CatFileFlipSignature"] = constants.CatFileFlipSignature
|
||||
signatures["CatFilePitVowSignature"] = constants.CatFilePitVowSignature
|
||||
signatures["DealSignature"] = constants.DealSignature
|
||||
signatures["DentFunctionSignature"] = constants.DentFunctionSignature
|
||||
signatures["DripDripSignature"] = constants.DripDripSignature
|
||||
signatures["DripFileIlkSignature"] = constants.DripFileIlkSignature
|
||||
signatures["DripFileRepoSignature"] = constants.DripFileRepoSignature
|
||||
signatures["DripFileVowSignature"] = constants.DripFileVowSignature
|
||||
signatures["FlapKickSignature"] = constants.FlapKickSignature
|
||||
signatures["FlipKickSignature"] = constants.FlipKickSignature
|
||||
signatures["FlopKickSignature"] = constants.FlopKickSignature
|
||||
signatures["FrobSignature"] = constants.FrobSignature
|
||||
signatures["LogValueSignature"] = constants.LogValueSignature
|
||||
signatures["PitFileDebtCeilingSignature"] = constants.PitFileDebtCeilingSignature
|
||||
signatures["PitFileIlkSignature"] = constants.PitFileIlkSignature
|
||||
signatures["TendFunctionSignature"] = constants.TendFunctionSignature
|
||||
signatures["VatFluxSignature"] = constants.VatFluxSignature
|
||||
signatures["VatFoldSignature"] = constants.VatFoldSignature
|
||||
signatures["VatGrabSignature"] = constants.VatGrabSignature
|
||||
signatures["VatHealSignature"] = constants.VatHealSignature
|
||||
signatures["VatInitSignature"] = constants.VatInitSignature
|
||||
signatures["VatMoveSignature"] = constants.VatMoveSignature
|
||||
signatures["VatSlipSignature"] = constants.VatSlipSignature
|
||||
signatures["VatTollSignature"] = constants.VatTollSignature
|
||||
signatures["VatTuneSignature"] = constants.VatTuneSignature
|
||||
signatures["VowFlogSignature"] = constants.VowFlogSignature
|
||||
signatures["BiteSignature"] = constants.GetBiteSignature()
|
||||
signatures["CatFileChopLumpSignature"] = constants.GetCatFileChopLumpSignature()
|
||||
signatures["CatFileFlipSignature"] = constants.GetCatFileFlipSignature()
|
||||
signatures["CatFilePitVowSignature"] = constants.GetCatFilePitVowSignature()
|
||||
signatures["DealSignature"] = constants.GetDealSignature()
|
||||
signatures["DentFunctionSignature"] = constants.GetDentFunctionSignature()
|
||||
signatures["DripDripSignature"] = constants.GetDripDripSignature()
|
||||
signatures["DripFileIlkSignature"] = constants.GetDripFileIlkSignature()
|
||||
signatures["DripFileRepoSignature"] = constants.GetDripFileRepoSignature()
|
||||
signatures["DripFileVowSignature"] = constants.GetDripFileVowSignature()
|
||||
signatures["FlapKickSignature"] = constants.GetFlapKickSignature()
|
||||
signatures["FlipKickSignature"] = constants.GetFlipKickSignature()
|
||||
signatures["FlopKickSignature"] = constants.GetFlopKickSignature()
|
||||
signatures["FrobSignature"] = constants.GetFrobSignature()
|
||||
signatures["LogValueSignature"] = constants.GetLogValueSignature()
|
||||
signatures["PitFileDebtCeilingSignature"] = constants.GetPitFileDebtCeilingSignature()
|
||||
signatures["PitFileIlkSignature"] = constants.GetPitFileIlkSignature()
|
||||
signatures["TendFunctionSignature"] = constants.GetTendFunctionSignature()
|
||||
signatures["VatFluxSignature"] = constants.GetVatFluxSignature()
|
||||
signatures["VatFoldSignature"] = constants.GetVatFoldSignature()
|
||||
signatures["VatGrabSignature"] = constants.GetVatGrabSignature()
|
||||
signatures["VatHealSignature"] = constants.GetVatHealSignature()
|
||||
signatures["VatInitSignature"] = constants.GetVatInitSignature()
|
||||
signatures["VatMoveSignature"] = constants.GetVatMoveSignature()
|
||||
signatures["VatSlipSignature"] = constants.GetVatSlipSignature()
|
||||
signatures["VatTollSignature"] = constants.GetVatTollSignature()
|
||||
signatures["VatTuneSignature"] = constants.GetVatTuneSignature()
|
||||
signatures["VowFlogSignature"] = constants.GetVowFlogSignature()
|
||||
|
||||
for name, sig := range signatures {
|
||||
log.Println(name, ": ", sig)
|
||||
fmt.Println(name, ": ", sig)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+11
-12
@@ -17,12 +17,12 @@
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/ethereum/go-ethereum/ethclient"
|
||||
"github.com/ethereum/go-ethereum/rpc"
|
||||
"github.com/mitchellh/go-homedir"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/spf13/viper"
|
||||
@@ -77,7 +77,7 @@ func database(cmd *cobra.Command, args []string) {
|
||||
func init() {
|
||||
cobra.OnInitialize(initConfig)
|
||||
|
||||
rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "environment/public.toml", "config file location")
|
||||
rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file location")
|
||||
rootCmd.PersistentFlags().String("database-name", "vulcanize_public", "database name")
|
||||
rootCmd.PersistentFlags().Int("database-port", 5432, "database port")
|
||||
rootCmd.PersistentFlags().String("database-hostname", "localhost", "database hostname")
|
||||
@@ -101,20 +101,19 @@ func initConfig() {
|
||||
if cfgFile != "" {
|
||||
viper.SetConfigFile(cfgFile)
|
||||
} else {
|
||||
home, err := homedir.Dir()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
viper.AddConfigPath(home)
|
||||
viper.SetConfigName(".vulcanizedb")
|
||||
noConfigError := "No config file passed with --config flag"
|
||||
fmt.Println("Error: ", noConfigError)
|
||||
log.Fatal(noConfigError)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
viper.AutomaticEnv()
|
||||
|
||||
if err := viper.ReadInConfig(); err == nil {
|
||||
log.Printf("Using config file: %s\n\n", viper.ConfigFileUsed())
|
||||
} else {
|
||||
invalidConfigError := "Couldn't read config file"
|
||||
fmt.Println("Error: ", invalidConfigError)
|
||||
log.Fatal(invalidConfigError)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user