Addressing review comments

stellar · Oct 4, 2023 · 1cf3e6e · 1cf3e6e
1 parent d41df1e
commit 1cf3e6e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/services/horizon/internal/flags.go b/services/horizon/internal/flags.go
@@ -703,8 +703,7 @@ func getCaptiveCoreBinaryPath() (string, error) {
 	return result, nil
 }
 
-// getCaptiveCoreConfigFromNetworkParameter generates the default Captive Core configuration.
-// validates the configuration settings, sets default values
+// getCaptiveCoreConfigFromNetworkParameter returns the default Captive Core configuration based on the network.
 func getCaptiveCoreConfigFromNetworkParameter(config *Config) (networkConfig, error) {
 	var defaultNetworkConfig networkConfig
 
@@ -726,8 +725,6 @@ func getCaptiveCoreConfigFromNetworkParameter(config *Config) (networkConfig, er
 	default:
 		return defaultNetworkConfig, fmt.Errorf("no default configuration found for network %s", config.Network)
 	}
-	config.NetworkPassphrase = defaultNetworkConfig.NetworkPassphrase
-	config.HistoryArchiveURLs = defaultNetworkConfig.HistoryArchiveURLs
 
 	return defaultNetworkConfig, nil
 }
@@ -743,6 +740,8 @@ func setCaptiveCoreConfiguration(config *Config, options ApplyOptions) error {
 		if err != nil {
 			return err
 		}
+		config.NetworkPassphrase = defaultNetworkConfig.NetworkPassphrase
+		config.HistoryArchiveURLs = defaultNetworkConfig.HistoryArchiveURLs
 	}
 
 	if config.NetworkPassphrase == "" {
@@ -759,7 +758,8 @@ func setCaptiveCoreConfiguration(config *Config, options ApplyOptions) error {
 
 	var err error
 	if config.CaptiveCoreConfigPath != "" {
-		config.CaptiveCoreToml, err = ledgerbackend.NewCaptiveCoreTomlFromFile(config.CaptiveCoreConfigPath, config.CaptiveCoreTomlParams)
+		config.CaptiveCoreToml, err = ledgerbackend.NewCaptiveCoreTomlFromFile(config.CaptiveCoreConfigPath,
+			config.CaptiveCoreTomlParams)
 		if err != nil {
 			return errors.Wrap(err, "invalid captive core toml file")
 		}
@@ -771,7 +771,8 @@ func setCaptiveCoreConfiguration(config *Config, options ApplyOptions) error {
 			return errors.Wrap(err, "invalid captive core toml file")
 		}
 	} else if len(defaultNetworkConfig.defaultConfig) != 0 {
-		config.CaptiveCoreToml, err = ledgerbackend.NewCaptiveCoreTomlFromData(defaultNetworkConfig.defaultConfig, config.CaptiveCoreTomlParams)
+		config.CaptiveCoreToml, err = ledgerbackend.NewCaptiveCoreTomlFromData(defaultNetworkConfig.defaultConfig,
+			config.CaptiveCoreTomlParams)
 		if err != nil {
 			return errors.Wrap(err, "invalid captive core toml file")
 		}

diff --git a/services/horizon/internal/flags_test.go b/services/horizon/internal/flags_test.go
@@ -71,11 +71,14 @@ func Test_createCaptiveCoreDefaultConfig(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			_, e := getCaptiveCoreConfigFromNetworkParameter(&tt.config)
+			e := setCaptiveCoreConfiguration(&tt.config,
+				ApplyOptions{RequireCaptiveCoreFullConfig: true})
 			if tt.errStr == "" {
 				assert.NoError(t, e)
 				assert.Equal(t, tt.networkPassphrase, tt.config.NetworkPassphrase)
 				assert.Equal(t, tt.historyArchiveURLs, tt.config.HistoryArchiveURLs)
+				assert.Equal(t, tt.networkPassphrase, tt.config.CaptiveCoreTomlParams.NetworkPassphrase)
+				assert.Equal(t, tt.historyArchiveURLs, tt.config.CaptiveCoreTomlParams.HistoryArchiveURLs)
 			} else {
 				assert.Equal(t, tt.errStr, e.Error())
 			}
@@ -171,6 +174,8 @@ func Test_createCaptiveCoreConfig(t *testing.T) {
 				ApplyOptions{RequireCaptiveCoreFullConfig: tt.requireCaptiveCoreConfig})
 			if tt.errStr == "" {
 				assert.NoError(t, e)
+				assert.Equal(t, tt.networkPassphrase, tt.config.NetworkPassphrase)
+				assert.Equal(t, tt.historyArchiveURLs, tt.config.HistoryArchiveURLs)
 				assert.Equal(t, tt.networkPassphrase, tt.config.CaptiveCoreTomlParams.NetworkPassphrase)
 				assert.Equal(t, tt.historyArchiveURLs, tt.config.CaptiveCoreTomlParams.HistoryArchiveURLs)
 			} else {