From 56bd8b6b5779fd29f59a56a702c1301758b8228f Mon Sep 17 00:00:00 2001 From: Urvi Date: Fri, 19 Jul 2024 10:05:37 -0700 Subject: [PATCH] Relocate --- Makefile | 2 +- .../ledgerexporter/DEVELOPER_GUIDE.md | 0 {exp/services => services}/ledgerexporter/Makefile | 8 ++++---- {exp/services => services}/ledgerexporter/README.md | 0 .../ledgerexporter/architecture.png | Bin .../ledgerexporter/config.example.toml | 0 .../ledgerexporter/docker/Dockerfile | 2 +- .../ledgerexporter/docker/config.test.toml | 0 .../ledgerexporter/internal/app.go | 0 .../ledgerexporter/internal/app_test.go | 0 .../ledgerexporter/internal/config.go | 0 .../ledgerexporter/internal/config_test.go | 0 .../ledgerexporter/internal/exportmanager.go | 0 .../ledgerexporter/internal/exportmanager_test.go | 0 .../ledgerexporter/internal/integration_test.go | 0 .../ledgerexporter/internal/ledger_meta_archive.go | 0 .../internal/ledger_meta_archive_test.go | 0 .../ledgerexporter/internal/main.go | 0 .../ledgerexporter/internal/main_test.go | 0 .../ledgerexporter/internal/queue.go | 0 .../ledgerexporter/internal/queue_test.go | 0 .../ledgerexporter/internal/test/10perfile.toml | 0 .../ledgerexporter/internal/test/15perfile.toml | 0 .../ledgerexporter/internal/test/1perfile.toml | 0 .../ledgerexporter/internal/test/64perfile.toml | 0 .../internal/test/captive-core-test.cfg | 0 .../internal/test/integration_captive_core.cfg | 0 .../internal/test/integration_config_template.toml | 0 .../test/invalid_captive_core_toml_path.toml | 0 .../ledgerexporter/internal/test/invalid_empty.toml | 0 .../test/invalid_preconfigured_network.toml | 0 .../ledgerexporter/internal/test/no_core_bin.toml | 0 .../ledgerexporter/internal/test/test.toml | 0 .../ledgerexporter/internal/test/useragent.toml | 0 .../internal/test/valid_captive_core_manual.toml | 0 .../internal/test/valid_captive_core_override.toml | 0 .../test/valid_captive_core_override_archives.toml | 0 .../test/valid_captive_core_preconfigured.toml | 0 .../internal/test/validate_start_end.toml | 0 .../ledgerexporter/internal/uploader.go | 0 .../ledgerexporter/internal/uploader_test.go | 0 {exp/services => services}/ledgerexporter/main.go | 2 +- 42 files changed, 7 insertions(+), 7 deletions(-) rename {exp/services => services}/ledgerexporter/DEVELOPER_GUIDE.md (100%) rename {exp/services => services}/ledgerexporter/Makefile (84%) rename {exp/services => services}/ledgerexporter/README.md (100%) rename {exp/services => services}/ledgerexporter/architecture.png (100%) rename {exp/services => services}/ledgerexporter/config.example.toml (100%) rename {exp/services => services}/ledgerexporter/docker/Dockerfile (93%) rename {exp/services => services}/ledgerexporter/docker/config.test.toml (100%) rename {exp/services => services}/ledgerexporter/internal/app.go (100%) rename {exp/services => services}/ledgerexporter/internal/app_test.go (100%) rename {exp/services => services}/ledgerexporter/internal/config.go (100%) rename {exp/services => services}/ledgerexporter/internal/config_test.go (100%) rename {exp/services => services}/ledgerexporter/internal/exportmanager.go (100%) rename {exp/services => services}/ledgerexporter/internal/exportmanager_test.go (100%) rename {exp/services => services}/ledgerexporter/internal/integration_test.go (100%) rename {exp/services => services}/ledgerexporter/internal/ledger_meta_archive.go (100%) rename {exp/services => services}/ledgerexporter/internal/ledger_meta_archive_test.go (100%) rename {exp/services => services}/ledgerexporter/internal/main.go (100%) rename {exp/services => services}/ledgerexporter/internal/main_test.go (100%) rename {exp/services => services}/ledgerexporter/internal/queue.go (100%) rename {exp/services => services}/ledgerexporter/internal/queue_test.go (100%) rename {exp/services => services}/ledgerexporter/internal/test/10perfile.toml (100%) rename {exp/services => services}/ledgerexporter/internal/test/15perfile.toml (100%) rename {exp/services => services}/ledgerexporter/internal/test/1perfile.toml (100%) rename {exp/services => services}/ledgerexporter/internal/test/64perfile.toml (100%) rename {exp/services => services}/ledgerexporter/internal/test/captive-core-test.cfg (100%) rename {exp/services => services}/ledgerexporter/internal/test/integration_captive_core.cfg (100%) rename {exp/services => services}/ledgerexporter/internal/test/integration_config_template.toml (100%) rename {exp/services => services}/ledgerexporter/internal/test/invalid_captive_core_toml_path.toml (100%) rename {exp/services => services}/ledgerexporter/internal/test/invalid_empty.toml (100%) rename {exp/services => services}/ledgerexporter/internal/test/invalid_preconfigured_network.toml (100%) rename {exp/services => services}/ledgerexporter/internal/test/no_core_bin.toml (100%) rename {exp/services => services}/ledgerexporter/internal/test/test.toml (100%) rename {exp/services => services}/ledgerexporter/internal/test/useragent.toml (100%) rename {exp/services => services}/ledgerexporter/internal/test/valid_captive_core_manual.toml (100%) rename {exp/services => services}/ledgerexporter/internal/test/valid_captive_core_override.toml (100%) rename {exp/services => services}/ledgerexporter/internal/test/valid_captive_core_override_archives.toml (100%) rename {exp/services => services}/ledgerexporter/internal/test/valid_captive_core_preconfigured.toml (100%) rename {exp/services => services}/ledgerexporter/internal/test/validate_start_end.toml (100%) rename {exp/services => services}/ledgerexporter/internal/uploader.go (100%) rename {exp/services => services}/ledgerexporter/internal/uploader_test.go (100%) rename {exp/services => services}/ledgerexporter/main.go (67%) diff --git a/Makefile b/Makefile index 69d46f68c3..63a9e94b6b 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ horizon: $(MAKE) -C services/horizon/ binary-build ledger-exporter: - $(MAKE) -C exp/services/ledgerexporter/ docker-build + $(MAKE) -C services/ledgerexporter/ docker-build webauth: $(MAKE) -C exp/services/webauth/ docker-build diff --git a/exp/services/ledgerexporter/DEVELOPER_GUIDE.md b/services/ledgerexporter/DEVELOPER_GUIDE.md similarity index 100% rename from exp/services/ledgerexporter/DEVELOPER_GUIDE.md rename to services/ledgerexporter/DEVELOPER_GUIDE.md diff --git a/exp/services/ledgerexporter/Makefile b/services/ledgerexporter/Makefile similarity index 84% rename from exp/services/ledgerexporter/Makefile rename to services/ledgerexporter/Makefile index 6561c4f24c..eeca66de27 100644 --- a/exp/services/ledgerexporter/Makefile +++ b/services/ledgerexporter/Makefile @@ -6,11 +6,11 @@ VERSION ?= $(shell git rev-parse --short HEAD) DOCKER_IMAGE := stellar/ledger-exporter docker-build: - cd ../../../ && \ + cd ../../ && \ $(SUDO) docker build --platform linux/amd64 --pull --label org.opencontainers.image.created="$(BUILD_DATE)" \ - --build-arg GOFLAGS="-ldflags=-X=github.com/stellar/go/exp/services/ledgerexporter/internal.version=$(VERSION)" \ + --build-arg GOFLAGS="-ldflags=-X=github.com/stellar/go/services/ledgerexporter/internal.version=$(VERSION)" \ $(if $(STELLAR_CORE_VERSION), --build-arg STELLAR_CORE_VERSION=$(STELLAR_CORE_VERSION)) \ - -f exp/services/ledgerexporter/docker/Dockerfile \ + -f services/ledgerexporter/docker/Dockerfile \ -t $(DOCKER_IMAGE):$(VERSION) \ -t $(DOCKER_IMAGE):latest . @@ -33,7 +33,7 @@ docker-test-fake-gcs: docker-clean # Run the ledger-exporter $(SUDO) docker run --platform linux/amd64 -t --network test-network\ - -v ${PWD}/exp/services/ledgerexporter/docker/config.test.toml:/config.toml \ + -v ${PWD}/services/ledgerexporter/docker/config.test.toml:/config.toml \ -e STORAGE_EMULATOR_HOST=http://fake-gcs-server:4443 \ $(DOCKER_IMAGE):$(VERSION) \ scan-and-fill --start 1000 --end 2000 diff --git a/exp/services/ledgerexporter/README.md b/services/ledgerexporter/README.md similarity index 100% rename from exp/services/ledgerexporter/README.md rename to services/ledgerexporter/README.md diff --git a/exp/services/ledgerexporter/architecture.png b/services/ledgerexporter/architecture.png similarity index 100% rename from exp/services/ledgerexporter/architecture.png rename to services/ledgerexporter/architecture.png diff --git a/exp/services/ledgerexporter/config.example.toml b/services/ledgerexporter/config.example.toml similarity index 100% rename from exp/services/ledgerexporter/config.example.toml rename to services/ledgerexporter/config.example.toml diff --git a/exp/services/ledgerexporter/docker/Dockerfile b/services/ledgerexporter/docker/Dockerfile similarity index 93% rename from exp/services/ledgerexporter/docker/Dockerfile rename to services/ledgerexporter/docker/Dockerfile index 7144800d87..fea21d86c5 100644 --- a/exp/services/ledgerexporter/docker/Dockerfile +++ b/services/ledgerexporter/docker/Dockerfile @@ -10,7 +10,7 @@ RUN go mod download COPY . ./ ARG GOFLAGS -RUN go install github.com/stellar/go/exp/services/ledgerexporter +RUN go install github.com/stellar/go/services/ledgerexporter FROM ubuntu:22.04 ARG STELLAR_CORE_VERSION diff --git a/exp/services/ledgerexporter/docker/config.test.toml b/services/ledgerexporter/docker/config.test.toml similarity index 100% rename from exp/services/ledgerexporter/docker/config.test.toml rename to services/ledgerexporter/docker/config.test.toml diff --git a/exp/services/ledgerexporter/internal/app.go b/services/ledgerexporter/internal/app.go similarity index 100% rename from exp/services/ledgerexporter/internal/app.go rename to services/ledgerexporter/internal/app.go diff --git a/exp/services/ledgerexporter/internal/app_test.go b/services/ledgerexporter/internal/app_test.go similarity index 100% rename from exp/services/ledgerexporter/internal/app_test.go rename to services/ledgerexporter/internal/app_test.go diff --git a/exp/services/ledgerexporter/internal/config.go b/services/ledgerexporter/internal/config.go similarity index 100% rename from exp/services/ledgerexporter/internal/config.go rename to services/ledgerexporter/internal/config.go diff --git a/exp/services/ledgerexporter/internal/config_test.go b/services/ledgerexporter/internal/config_test.go similarity index 100% rename from exp/services/ledgerexporter/internal/config_test.go rename to services/ledgerexporter/internal/config_test.go diff --git a/exp/services/ledgerexporter/internal/exportmanager.go b/services/ledgerexporter/internal/exportmanager.go similarity index 100% rename from exp/services/ledgerexporter/internal/exportmanager.go rename to services/ledgerexporter/internal/exportmanager.go diff --git a/exp/services/ledgerexporter/internal/exportmanager_test.go b/services/ledgerexporter/internal/exportmanager_test.go similarity index 100% rename from exp/services/ledgerexporter/internal/exportmanager_test.go rename to services/ledgerexporter/internal/exportmanager_test.go diff --git a/exp/services/ledgerexporter/internal/integration_test.go b/services/ledgerexporter/internal/integration_test.go similarity index 100% rename from exp/services/ledgerexporter/internal/integration_test.go rename to services/ledgerexporter/internal/integration_test.go diff --git a/exp/services/ledgerexporter/internal/ledger_meta_archive.go b/services/ledgerexporter/internal/ledger_meta_archive.go similarity index 100% rename from exp/services/ledgerexporter/internal/ledger_meta_archive.go rename to services/ledgerexporter/internal/ledger_meta_archive.go diff --git a/exp/services/ledgerexporter/internal/ledger_meta_archive_test.go b/services/ledgerexporter/internal/ledger_meta_archive_test.go similarity index 100% rename from exp/services/ledgerexporter/internal/ledger_meta_archive_test.go rename to services/ledgerexporter/internal/ledger_meta_archive_test.go diff --git a/exp/services/ledgerexporter/internal/main.go b/services/ledgerexporter/internal/main.go similarity index 100% rename from exp/services/ledgerexporter/internal/main.go rename to services/ledgerexporter/internal/main.go diff --git a/exp/services/ledgerexporter/internal/main_test.go b/services/ledgerexporter/internal/main_test.go similarity index 100% rename from exp/services/ledgerexporter/internal/main_test.go rename to services/ledgerexporter/internal/main_test.go diff --git a/exp/services/ledgerexporter/internal/queue.go b/services/ledgerexporter/internal/queue.go similarity index 100% rename from exp/services/ledgerexporter/internal/queue.go rename to services/ledgerexporter/internal/queue.go diff --git a/exp/services/ledgerexporter/internal/queue_test.go b/services/ledgerexporter/internal/queue_test.go similarity index 100% rename from exp/services/ledgerexporter/internal/queue_test.go rename to services/ledgerexporter/internal/queue_test.go diff --git a/exp/services/ledgerexporter/internal/test/10perfile.toml b/services/ledgerexporter/internal/test/10perfile.toml similarity index 100% rename from exp/services/ledgerexporter/internal/test/10perfile.toml rename to services/ledgerexporter/internal/test/10perfile.toml diff --git a/exp/services/ledgerexporter/internal/test/15perfile.toml b/services/ledgerexporter/internal/test/15perfile.toml similarity index 100% rename from exp/services/ledgerexporter/internal/test/15perfile.toml rename to services/ledgerexporter/internal/test/15perfile.toml diff --git a/exp/services/ledgerexporter/internal/test/1perfile.toml b/services/ledgerexporter/internal/test/1perfile.toml similarity index 100% rename from exp/services/ledgerexporter/internal/test/1perfile.toml rename to services/ledgerexporter/internal/test/1perfile.toml diff --git a/exp/services/ledgerexporter/internal/test/64perfile.toml b/services/ledgerexporter/internal/test/64perfile.toml similarity index 100% rename from exp/services/ledgerexporter/internal/test/64perfile.toml rename to services/ledgerexporter/internal/test/64perfile.toml diff --git a/exp/services/ledgerexporter/internal/test/captive-core-test.cfg b/services/ledgerexporter/internal/test/captive-core-test.cfg similarity index 100% rename from exp/services/ledgerexporter/internal/test/captive-core-test.cfg rename to services/ledgerexporter/internal/test/captive-core-test.cfg diff --git a/exp/services/ledgerexporter/internal/test/integration_captive_core.cfg b/services/ledgerexporter/internal/test/integration_captive_core.cfg similarity index 100% rename from exp/services/ledgerexporter/internal/test/integration_captive_core.cfg rename to services/ledgerexporter/internal/test/integration_captive_core.cfg diff --git a/exp/services/ledgerexporter/internal/test/integration_config_template.toml b/services/ledgerexporter/internal/test/integration_config_template.toml similarity index 100% rename from exp/services/ledgerexporter/internal/test/integration_config_template.toml rename to services/ledgerexporter/internal/test/integration_config_template.toml diff --git a/exp/services/ledgerexporter/internal/test/invalid_captive_core_toml_path.toml b/services/ledgerexporter/internal/test/invalid_captive_core_toml_path.toml similarity index 100% rename from exp/services/ledgerexporter/internal/test/invalid_captive_core_toml_path.toml rename to services/ledgerexporter/internal/test/invalid_captive_core_toml_path.toml diff --git a/exp/services/ledgerexporter/internal/test/invalid_empty.toml b/services/ledgerexporter/internal/test/invalid_empty.toml similarity index 100% rename from exp/services/ledgerexporter/internal/test/invalid_empty.toml rename to services/ledgerexporter/internal/test/invalid_empty.toml diff --git a/exp/services/ledgerexporter/internal/test/invalid_preconfigured_network.toml b/services/ledgerexporter/internal/test/invalid_preconfigured_network.toml similarity index 100% rename from exp/services/ledgerexporter/internal/test/invalid_preconfigured_network.toml rename to services/ledgerexporter/internal/test/invalid_preconfigured_network.toml diff --git a/exp/services/ledgerexporter/internal/test/no_core_bin.toml b/services/ledgerexporter/internal/test/no_core_bin.toml similarity index 100% rename from exp/services/ledgerexporter/internal/test/no_core_bin.toml rename to services/ledgerexporter/internal/test/no_core_bin.toml diff --git a/exp/services/ledgerexporter/internal/test/test.toml b/services/ledgerexporter/internal/test/test.toml similarity index 100% rename from exp/services/ledgerexporter/internal/test/test.toml rename to services/ledgerexporter/internal/test/test.toml diff --git a/exp/services/ledgerexporter/internal/test/useragent.toml b/services/ledgerexporter/internal/test/useragent.toml similarity index 100% rename from exp/services/ledgerexporter/internal/test/useragent.toml rename to services/ledgerexporter/internal/test/useragent.toml diff --git a/exp/services/ledgerexporter/internal/test/valid_captive_core_manual.toml b/services/ledgerexporter/internal/test/valid_captive_core_manual.toml similarity index 100% rename from exp/services/ledgerexporter/internal/test/valid_captive_core_manual.toml rename to services/ledgerexporter/internal/test/valid_captive_core_manual.toml diff --git a/exp/services/ledgerexporter/internal/test/valid_captive_core_override.toml b/services/ledgerexporter/internal/test/valid_captive_core_override.toml similarity index 100% rename from exp/services/ledgerexporter/internal/test/valid_captive_core_override.toml rename to services/ledgerexporter/internal/test/valid_captive_core_override.toml diff --git a/exp/services/ledgerexporter/internal/test/valid_captive_core_override_archives.toml b/services/ledgerexporter/internal/test/valid_captive_core_override_archives.toml similarity index 100% rename from exp/services/ledgerexporter/internal/test/valid_captive_core_override_archives.toml rename to services/ledgerexporter/internal/test/valid_captive_core_override_archives.toml diff --git a/exp/services/ledgerexporter/internal/test/valid_captive_core_preconfigured.toml b/services/ledgerexporter/internal/test/valid_captive_core_preconfigured.toml similarity index 100% rename from exp/services/ledgerexporter/internal/test/valid_captive_core_preconfigured.toml rename to services/ledgerexporter/internal/test/valid_captive_core_preconfigured.toml diff --git a/exp/services/ledgerexporter/internal/test/validate_start_end.toml b/services/ledgerexporter/internal/test/validate_start_end.toml similarity index 100% rename from exp/services/ledgerexporter/internal/test/validate_start_end.toml rename to services/ledgerexporter/internal/test/validate_start_end.toml diff --git a/exp/services/ledgerexporter/internal/uploader.go b/services/ledgerexporter/internal/uploader.go similarity index 100% rename from exp/services/ledgerexporter/internal/uploader.go rename to services/ledgerexporter/internal/uploader.go diff --git a/exp/services/ledgerexporter/internal/uploader_test.go b/services/ledgerexporter/internal/uploader_test.go similarity index 100% rename from exp/services/ledgerexporter/internal/uploader_test.go rename to services/ledgerexporter/internal/uploader_test.go diff --git a/exp/services/ledgerexporter/main.go b/services/ledgerexporter/main.go similarity index 67% rename from exp/services/ledgerexporter/main.go rename to services/ledgerexporter/main.go index 6d38c69df9..04cb23c637 100644 --- a/exp/services/ledgerexporter/main.go +++ b/services/ledgerexporter/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - exporter "github.com/stellar/go/exp/services/ledgerexporter/internal" + exporter "github.com/stellar/go/services/ledgerexporter/internal" ) func main() {