From 245b5db3779633f05d7dc71e5ddc6853b891dd1c Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <alfonso@stellar.org>
Date: Tue, 19 Nov 2024 17:59:03 +0100
Subject: [PATCH] Fix migration tests

---
 .../infrastructure/docker/docker-compose.yml               | 2 +-
 .../internal/integrationtest/infrastructure/test.go        | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cmd/stellar-rpc/internal/integrationtest/infrastructure/docker/docker-compose.yml b/cmd/stellar-rpc/internal/integrationtest/infrastructure/docker/docker-compose.yml
index de3bcc49..bc3150f8 100644
--- a/cmd/stellar-rpc/internal/integrationtest/infrastructure/docker/docker-compose.yml
+++ b/cmd/stellar-rpc/internal/integrationtest/infrastructure/docker/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     # Note: Please keep the image pinned to an immutable tag matching the Captive Core version.
     #       This avoids implicit updates which break compatibility between
     #       the Core container and captive core.
-    image: ${CORE_IMAGE:-stellar/stellar-core:21.1.0-1909.rc1.b3aeb14cc.focal}
+    image: ${CORE_IMAGE:-stellar/stellar-core:22.0.0-2138.721fd0a65.focal}
     depends_on:
       - core-postgres
     environment:
diff --git a/cmd/stellar-rpc/internal/integrationtest/infrastructure/test.go b/cmd/stellar-rpc/internal/integrationtest/infrastructure/test.go
index 9b543f71..efddae95 100644
--- a/cmd/stellar-rpc/internal/integrationtest/infrastructure/test.go
+++ b/cmd/stellar-rpc/internal/integrationtest/infrastructure/test.go
@@ -342,9 +342,10 @@ func (i *Test) waitForRPC() {
 
 func (i *Test) generateCaptiveCoreCfgForContainer() {
 	getOldVersionCaptiveCoreConfigVersion := func(dir string, filename string) ([]byte, error) {
-		cmd := exec.Command("git", "show", fmt.Sprintf("v%s:./%s/%s", i.rpcContainerVersion, dir, filename))
-		cmd.Dir = GetCurrentDirectory()
-		return cmd.Output()
+		// TODO: to be removed once we go over the stellar-rpc renaming
+		cmd := exec.Command("git", "show", fmt.Sprintf("v%s:./soroban-rpc/internal/integrationtest/infrastructure/%s/%s", i.rpcContainerVersion, dir, filename))
+		cmd.Dir = GetCurrentDirectory() + "/../../../../"
+		return cmd.CombinedOutput()
 	}
 
 	// Get old version of captive-core-integration-tests.cfg.tmpl