Clean up

Signed-off-by: litt3 <[email protected]>

Author: litt3

testutils/env_vars.go

@@ -67,7 +67,7 @@ func configureContextFromEnvVars(envVars []EnvVar, flags []cli.Flag) (*cli.Conte
 	return ctx, nil
 }
 
-// getDefaultTestEnvVars build a slice of default env var definitions
+// getDefaultTestEnvVars builds a slice of default env var definitions
 //
 // Env vars are used to configure tests, since that's how it's done in production. We want to exercise as many prod
 // code pathways as possible in e2e tests.
@@ -115,77 +115,79 @@ func getV1EnvVars(
 		pollInterval = time.Minute * 1
 	}
 
-	var disperserHostname string
-	var svcManagerAddress string
-	switch backend {
-	case MemstoreBackend:
-		// no need to set these fields for local tests
-		break
-	case PreprodBackend:
-		disperserHostname = disperserPreprodHostname
-		svcManagerAddress = preprodSvcManagerAddress
-	case TestnetBackend:
-		disperserHostname = disperserTestnetHostname
-		svcManagerAddress = testnetSvcManagerAddress
-	default:
-		panic("Unsupported backend")
-	}
-
 	envVars := []EnvVar{
 		{eigendaflags.SignerPrivateKeyHexFlagName, signingKey},
 		{eigendaflags.EthRPCURLFlagName, ethRPCURL},
-		{eigendaflags.DisperserRPCFlagName, disperserHostname + ":" + disperserPort},
 		{eigendaflags.StatusQueryRetryIntervalFlagName, pollInterval.String()},
 		{eigendaflags.DisableTLSFlagName, fmt.Sprintf("%v", false)},
 		{eigendaflags.ConfirmationDepthFlagName, "1"},
-		{eigendaflags.SvcManagerAddrFlagName, svcManagerAddress},
 		{eigendaflags.MaxBlobLengthFlagName, maxBlobLengthString},
 		{eigendaflags.StatusQueryTimeoutFlagName, "45m"},
 	}
 
-	return envVars
-}
-
-func getV2EnvVars(
-	backend Backend,
-	useV2 bool,
-	signingKey string,
-	ethRPCURL string,
-	maxBlobLengthString string,
-) []EnvVar {
-	var disperserHostname string
-	var certVerifierAddress string
 	switch backend {
 	case MemstoreBackend:
 		// no need to set these fields for local tests
 		break
 	case PreprodBackend:
-		disperserHostname = disperserPreprodHostname
-		certVerifierAddress = preprodCertVerifierAddress
+		envVars = append(
+			envVars,
+			EnvVar{eigendaflags.DisperserRPCFlagName, disperserPreprodHostname + ":" + disperserPort})
+		envVars = append(envVars, EnvVar{eigendaflags.SvcManagerAddrFlagName, preprodSvcManagerAddress})
 	case TestnetBackend:
-		disperserHostname = disperserTestnetHostname
-		certVerifierAddress = testnetCertVerifierAddress
+		envVars = append(
+			envVars,
+			EnvVar{eigendaflags.DisperserRPCFlagName, disperserTestnetHostname + ":" + disperserPort})
+		envVars = append(envVars, EnvVar{eigendaflags.SvcManagerAddrFlagName, testnetSvcManagerAddress})
 	default:
 		panic("Unsupported backend")
 	}
 
+	return envVars
+}
+
+func getV2EnvVars(
+	backend Backend,
+	useV2 bool,
+	signingKey string,
+	ethRPCURL string,
+	maxBlobLengthString string,
+) []EnvVar {
 	envVars := []EnvVar{
 		{eigendaflagsv2.SignerPaymentKeyHexFlagName, signingKey},
 		{eigendaflagsv2.EthRPCURLFlagName, ethRPCURL},
 		{eigendaflagsv2.V2EnabledFlagName, fmt.Sprintf("%t", useV2)},
-		{eigendaflagsv2.DisperserFlagName, disperserHostname + ":" + disperserPort},
+
 		{eigendaflagsv2.DisableTLSFlagName, fmt.Sprintf("%v", false)},
 		{eigendaflagsv2.BlobStatusPollIntervalFlagName, "1s"},
 		{eigendaflagsv2.PutRetriesFlagName, "1"},
 		{eigendaflagsv2.DisperseBlobTimeoutFlagName, "2m"},
 		{eigendaflagsv2.BlobCertifiedTimeoutFlagName, "2m"},
-		{eigendaflagsv2.CertVerifierAddrFlagName, certVerifierAddress}, // holesky testnet
+
 		{eigendaflagsv2.RelayTimeoutFlagName, "5s"},
 		{eigendaflagsv2.ContractCallTimeoutFlagName, "5s"},
 		{eigendaflagsv2.BlobParamsVersionFlagName, "0"},
 		{eigendaflagsv2.MaxBlobLengthFlagName, maxBlobLengthString},
 	}
 
+	switch backend {
+	case MemstoreBackend:
+		// no need to set these fields for local tests
+		break
+	case PreprodBackend:
+		envVars = append(
+			envVars,
+			EnvVar{eigendaflagsv2.DisperserFlagName, disperserPreprodHostname + ":" + disperserPort})
+		envVars = append(envVars, EnvVar{eigendaflagsv2.CertVerifierAddrFlagName, preprodCertVerifierAddress})
+	case TestnetBackend:
+		envVars = append(
+			envVars,
+			EnvVar{eigendaflagsv2.DisperserFlagName, disperserTestnetHostname + ":" + disperserPort})
+		envVars = append(envVars, EnvVar{eigendaflagsv2.CertVerifierAddrFlagName, testnetCertVerifierAddress})
+	default:
+		panic("Unsupported backend")
+	}
+
 	return envVars
 }
 

verify/deprecated_flags.go

@@ -3,8 +3,7 @@ package verify
 import (
 	"fmt"
 
-	eigendaflagsv1 "github.com/Layr-Labs/eigenda-proxy/config/eigendaflags"
-	eigendaflagsv2 "github.com/Layr-Labs/eigenda-proxy/config/v2/eigendaflags"
+	"github.com/Layr-Labs/eigenda-proxy/config/eigendaflags"
 	"github.com/urfave/cli/v2"
 )
 
@@ -44,7 +43,7 @@ func DeprecatedCLIFlags(envPrefix, category string) []cli.Flag {
 				return fmt.Errorf(
 					"flag --%s (env var %s) is deprecated, use --%s (env var %s) instead",
 					DeprecatedEthRPCFlagName, withDeprecatedEnvPrefix(envPrefix, "ETH_RPC"),
-					eigendaflagsv2.EthRPCURLFlagName, withEnvPrefix(envPrefix, "ETH_RPC"))
+					eigendaflags.EthRPCURLFlagName, withEnvPrefix(envPrefix, "ETH_RPC"))
 			},
 			Category: category,
 		},
@@ -56,7 +55,7 @@ func DeprecatedCLIFlags(envPrefix, category string) []cli.Flag {
 				return fmt.Errorf(
 					"flag --%s (env var %s) is deprecated, use --%s (env var %s) instead",
 					DeprecatedSvcManagerAddrFlagName, withDeprecatedEnvPrefix(envPrefix, "SERVICE_MANAGER_ADDR"),
-					eigendaflagsv1.SvcManagerAddrFlagName, withEnvPrefix(envPrefix, "SERVICE_MANAGER_ADDR"))
+					eigendaflags.SvcManagerAddrFlagName, withEnvPrefix(envPrefix, "SERVICE_MANAGER_ADDR"))
 			},
 			Category: category,
 		},
@@ -70,7 +69,7 @@ func DeprecatedCLIFlags(envPrefix, category string) []cli.Flag {
 					"flag --%s (env var %s) is deprecated, use --%s (env var %s) instead",
 					DeprecatedEthConfirmationDepthFlagName,
 					withDeprecatedEnvPrefix(envPrefix, "ETH_CONFIRMATION_DEPTH"),
-					eigendaflagsv1.ConfirmationDepthFlagName,
+					eigendaflags.ConfirmationDepthFlagName,
 					withEnvPrefix(envPrefix, "CONFIRMATION_DEPTH"),
 				)
 			},
@@ -135,7 +134,7 @@ func DeprecatedCLIFlags(envPrefix, category string) []cli.Flag {
 				return fmt.Errorf(
 					"flag --%s (env var %s) is deprecated, use --%s (env var %s) instead",
 					DeprecatedMaxBlobLengthFlagName, withDeprecatedEnvPrefix(envPrefix, "MAX_BLOB_LENGTH"),
-					eigendaflagsv2.MaxBlobLengthFlagName, withEnvPrefix(envPrefix, "MAX_BLOB_LENGTH"))
+					eigendaflags.MaxBlobLengthFlagName, withEnvPrefix(envPrefix, "MAX_BLOB_LENGTH"))
 			},
 			// we also use this flag for memstore.
 			// should we duplicate the flag? Or is there a better way to handle this?