Allow for taking all config from a single config source

sygmaprotocol · Oct 9, 2024 · e722838 · e722838
1 parent 6baf516
commit e722838
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/app/app.go b/app/app.go
@@ -76,7 +76,7 @@ func Run() error {
 	configFlag := viper.GetString(config.ConfigFlagName)
 	configURL := viper.GetString("config-url")
 
-	configuration := &config.Config{}
+	var configuration *config.Config
 	if configURL != "" {
 		configuration, err = config.GetSharedConfigFromNetwork(configURL, configuration)
 		panicOnError(err)

diff --git a/config/config.go b/config/config.go
@@ -97,6 +97,12 @@ func processRawConfig(rawConfig RawConfig, config *Config) (*Config, error) {
 	if err != nil {
 		return config, err
 	}
+	if config == nil {
+		config := &Config{}
+		config.RelayerConfig = relayerConfig
+		config.ChainConfigs = rawConfig.ChainConfigs
+		return config, nil
+	}
 
 	chainConfigs := make([]map[string]interface{}, 0)
 	for i, chain := range rawConfig.ChainConfigs {

diff --git a/example/app/app.go b/example/app/app.go
@@ -67,8 +67,7 @@ import (
 )
 
 func Run() error {
-	configuration := &config.Config{}
-	configuration, err := config.GetConfigFromFile(viper.GetString(config.ConfigFlagName), configuration)
+	configuration, err := config.GetConfigFromFile(viper.GetString(config.ConfigFlagName), nil)
 	if err != nil {
 		panic(err)
 	}