exp/ledgerexporter: Drop unneeded dependency on historyarchive. (st…

…ellar#4778) * Also, fix up bad merge in the captive core config
Shaptic · Jan 11, 2024 · ed7ae81 · ed7ae81
1 parent 423fa1f
commit ed7ae81
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/exp/lighthorizon/build/ledgerexporter/captive-core-pubnet.cfg b/exp/lighthorizon/build/ledgerexporter/captive-core-pubnet.cfg
@@ -191,16 +191,8 @@ ADDRESS = "stellar2.franklintempleton.com:11625"
 HISTORY = "curl -sf https://stellar-history-usc.franklintempleton.com/azuscshf401/{0} -o {1}"
 
 [[VALIDATORS]]
-<<<<<<<< HEAD:exp/lighthorizon/build/ledgerexporter/captive-core-pubnet.cfg
-NAME="wirexSG"
-ADDRESS="sg.stellar.wirexapp.com"
-HOME_DOMAIN="wirexapp.com"
-PUBLIC_KEY="GAB3GZIE6XAYWXGZUDM4GMFFLJBFMLE2JDPUCWUZXMOMT3NHXDHEWXAS"
-HISTORY="curl -sf http://wxhorizonasiastga1.blob.core.windows.net/history/{0} -o {1}"
-========
 NAME = "FT_SCV_3"
 HOME_DOMAIN = "www.franklintempleton.com"
 PUBLIC_KEY = "GA7DV63PBUUWNUFAF4GAZVXU2OZMYRATDLKTC7VTCG7AU4XUPN5VRX4A"
 ADDRESS = "stellar3.franklintempleton.com:11625"
 HISTORY = "curl -sf https://stellar-history-ins.franklintempleton.com/azinsshf401/{0} -o {1}"
->>>>>>>> master:services/horizon/internal/configs/captive-core-pubnet.cfg
diff --git a/exp/services/ledgerexporter/main.go b/exp/services/ledgerexporter/main.go
@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/s3"
-	"github.com/stellar/go/historyarchive"
 	"github.com/stellar/go/ingest/ledgerbackend"
 	"github.com/stellar/go/network"
 	supportlog "github.com/stellar/go/support/log"
@@ -60,7 +59,7 @@ func main() {
 	core, err := ledgerbackend.NewCaptive(captiveConfig)
 	logFatalIf(err, "Could not create captive core instance")
 
-	target, err := historyarchive.ConnectBackend(
+	target, err := storage.ConnectBackend(
 		*targetUrl,
 		storage.ConnectOptions{
 			Context:    context.Background(),