services/horizon: clean up duplicate captive-core default config files (

stellar#5293)
urvisavla · May 9, 2024 · 64cb187 · 64cb187
1 parent 18dee5c
commit 64cb187
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 234 deletions.
diff --git a/services/horizon/internal/configs/captive-core-pubnet.cfg b/services/horizon/internal/configs/captive-core-pubnet.cfg
diff --git a/services/horizon/internal/configs/captive-core-testnet.cfg b/services/horizon/internal/configs/captive-core-testnet.cfg
diff --git a/services/horizon/internal/docs/GUIDE_FOR_DEVELOPERS.md b/services/horizon/internal/docs/GUIDE_FOR_DEVELOPERS.md
@@ -94,7 +94,7 @@ Add a debug configuration in your IDE to attach a debugger to the local Horizon
      "program": "${workspaceRoot}/services/horizon/main.go",
      "env": {
          "DATABASE_URL": "postgres://postgres@localhost:5432/horizon?sslmode=disable",
-         "CAPTIVE_CORE_CONFIG_APPEND_PATH": "./services/horizon/internal/configs/captive-core-testnet.cfg",
+         "CAPTIVE_CORE_CONFIG_APPEND_PATH": "./ingest/ledgerbackend/configs/captive-core-testnet.cfg",
          "HISTORY_ARCHIVE_URLS": "https://history.stellar.org/prd/core-testnet/core_testnet_001,https://history.stellar.org/prd/core-testnet/core_testnet_002",
          "NETWORK_PASSPHRASE": "Test SDF Network ; September 2015",
          "PER_HOUR_RATE_LIMIT": "0"

diff --git a/services/horizon/internal/flags.go b/services/horizon/internal/flags.go
@@ -835,20 +835,14 @@ type networkConfig struct {
 }
 
 var (
-	//go:embed configs/captive-core-pubnet.cfg
-	PubnetDefaultConfig []byte
-
-	//go:embed configs/captive-core-testnet.cfg
-	TestnetDefaultConfig []byte
-
 	PubnetConf = networkConfig{
-		defaultConfig:      PubnetDefaultConfig,
+		defaultConfig:      ledgerbackend.PubnetDefaultConfig,
 		HistoryArchiveURLs: network.PublicNetworkhistoryArchiveURLs,
 		NetworkPassphrase:  network.PublicNetworkPassphrase,
 	}
 
 	TestnetConf = networkConfig{
-		defaultConfig:      TestnetDefaultConfig,
+		defaultConfig:      ledgerbackend.TestnetDefaultConfig,
 		HistoryArchiveURLs: network.TestNetworkhistoryArchiveURLs,
 		NetworkPassphrase:  network.TestNetworkPassphrase,
 	}

diff --git a/services/horizon/internal/flags_test.go b/services/horizon/internal/flags_test.go
@@ -118,7 +118,7 @@ func Test_createCaptiveCoreConfig(t *testing.T) {
 			config: Config{
 				NetworkPassphrase:     PubnetConf.NetworkPassphrase,
 				HistoryArchiveURLs:    PubnetConf.HistoryArchiveURLs,
-				CaptiveCoreConfigPath: "configs/captive-core-pubnet.cfg",
+				CaptiveCoreConfigPath: "../../../ingest/ledgerbackend/configs/captive-core-pubnet.cfg",
 				CaptiveCoreBinaryPath: "/path/to/captive-core/binary",
 			},
 			networkPassphrase:  PubnetConf.NetworkPassphrase,
@@ -171,7 +171,7 @@ func Test_createCaptiveCoreConfig(t *testing.T) {
 			config: Config{
 				NetworkPassphrase:     PubnetConf.NetworkPassphrase,
 				HistoryArchiveURLs:    PubnetConf.HistoryArchiveURLs,
-				CaptiveCoreConfigPath: "configs/captive-core-testnet.cfg",
+				CaptiveCoreConfigPath: "../../../ingest/ledgerbackend/configs/captive-core-testnet.cfg",
 				CaptiveCoreBinaryPath: "/path/to/captive-core/binary",
 			},
 			errStr: fmt.Sprintf("invalid captive core toml file: invalid captive core toml: "+