Skip core container creation for pubnet & testnet

stellar · Jul 24, 2023 · 04dc6a2 · 04dc6a2
1 parent 1f978e2
commit 04dc6a2
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 19 deletions.
diff --git a/services/horizon/internal/integration/parameters_test.go b/services/horizon/internal/integration/parameters_test.go
@@ -52,6 +52,20 @@ const (
 		QUALITY="MEDIUM"`
 )
 
+func NewParameterTestSkipContainerCreation(t *testing.T, params map[string]string) *integration.Test {
+	return NewParameterTestWithEnvSkipContainerCreation(t, params, map[string]string{})
+}
+
+func NewParameterTestWithEnvSkipContainerCreation(t *testing.T, params, envvars map[string]string) *integration.Test {
+	config := integration.Config{
+		ProtocolVersion:         17,
+		SkipHorizonStart:        true,
+		SkipContainerCreation:   true,
+		HorizonIngestParameters: params,
+		HorizonEnvironment:      envvars}
+	return integration.NewTest(t, config)
+}
+
 func NewParameterTest(t *testing.T, params map[string]string) *integration.Test {
 	return NewParameterTestWithEnv(t, params, map[string]string{})
 }
@@ -150,7 +164,7 @@ func TestNetworkParameter(t *testing.T) {
 		localParams := integration.MergeMaps(networkParamArgs, map[string]string{
 			horizon.NetworkFlagName: horizon.StellarPubnet,
 		})
-		test := NewParameterTest(t, localParams)
+		test := NewParameterTestSkipContainerCreation(t, localParams)
 		err := test.StartHorizon()
 		time.Sleep(10 * time.Second)
 		assert.NoError(t, err)
@@ -162,7 +176,7 @@ func TestNetworkParameter(t *testing.T) {
 		localParams := integration.MergeMaps(networkParamArgs, map[string]string{
 			horizon.NetworkFlagName: horizon.StellarTestnet,
 		})
-		test := NewParameterTest(t, localParams)
+		test := NewParameterTestSkipContainerCreation(t, localParams)
 		err := test.StartHorizon()
 		time.Sleep(10 * time.Second)
 		assert.NoError(t, err)
@@ -194,7 +208,7 @@ func TestNetworkEnvironmentVariable(t *testing.T) {
 	}()
 
 	t.Run("NETWORK environment variable pubnet", func(t *testing.T) {
-		test := NewParameterTestWithEnv(t, networkParamArgs,
+		test := NewParameterTestWithEnvSkipContainerCreation(t, networkParamArgs,
 			map[string]string{"NETWORK": horizon.StellarPubnet})
 		err := test.StartHorizon()
 		time.Sleep(10 * time.Second)
@@ -204,7 +218,7 @@ func TestNetworkEnvironmentVariable(t *testing.T) {
 	})
 
 	t.Run("NETWORK environment variable testnet", func(t *testing.T) {
-		test := NewParameterTestWithEnv(t, networkParamArgs,
+		test := NewParameterTestWithEnvSkipContainerCreation(t, networkParamArgs,
 			map[string]string{"NETWORK": horizon.StellarTestnet})
 		err := test.StartHorizon()
 		time.Sleep(10 * time.Second)

diff --git a/services/horizon/internal/test/integration/integration.go b/services/horizon/internal/test/integration/integration.go
@@ -119,23 +119,32 @@ func NewTest(t *testing.T, config Config) *Test {
 			config.ProtocolVersion = maxSupportedCoreProtocolFromEnv
 		}
 	}
-
-	composePath := findDockerComposePath()
-	i := &Test{
-		t:           t,
-		config:      config,
-		composePath: composePath,
-		passPhrase:  StandaloneNetworkPassphrase,
-		environment: NewEnvironmentManager(),
+	var i *Test
+	if !config.SkipContainerCreation {
+		composePath := findDockerComposePath()
+		i = &Test{
+			t:           t,
+			config:      config,
+			composePath: composePath,
+			passPhrase:  StandaloneNetworkPassphrase,
+			environment: NewEnvironmentManager(),
+		}
+		i.configureCaptiveCore()
+		// Only run Stellar Core container and its dependencies.
+		i.runComposeCommand("up", "--detach", "--quiet-pull", "--no-color", "core")
+	} else {
+		i = &Test{
+			t:           t,
+			config:      config,
+			environment: NewEnvironmentManager(),
+		}
 	}
 
-	i.configureCaptiveCore()
-
-	// Only run Stellar Core container and its dependencies.
-	i.runComposeCommand("up", "--detach", "--quiet-pull", "--no-color", "core")
 	i.prepareShutdownHandlers()
 	i.coreClient = &stellarcore.Client{URL: "http://localhost:" + strconv.Itoa(stellarCorePort)}
-	i.waitForCore()
+	if !config.SkipContainerCreation {
+		i.waitForCore()
+	}
 
 	if !config.SkipHorizonStart {
 		if innerErr := i.StartHorizon(); innerErr != nil {
@@ -224,8 +233,10 @@ func (i *Test) prepareShutdownHandlers() {
 			if i.ingestNode != nil {
 				i.ingestNode.Close()
 			}
-			i.runComposeCommand("rm", "-fvs", "core")
-			i.runComposeCommand("rm", "-fvs", "core-postgres")
+			if !i.config.SkipContainerCreation {
+				i.runComposeCommand("rm", "-fvs", "core")
+				i.runComposeCommand("rm", "-fvs", "core-postgres")
+			}
 		},
 		i.environment.Restore,
 	)