feat: OP Stack integration test - refactor testing

Author: ethenotethan

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Go Test E2E",
+            "type": "go",
+            "request": "launch",
+            "mode": "test",
+            "program": "${workspaceFolder}/e2e",
+            "env": {
+                "OPTIMISM": "true"
+            },
+            "args": [
+                "./e2e/...",
+                "-deploy-config", "/Users/ethenpociask/eigenlayer/eigenda-proxy/e2e/resources/optimism/devnetL1.json"
+            ]
+        },
+        {
+            "name": "Launch Package",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${fileDirname}"
+        }
+    ]
+}

Makefile

@@ -12,8 +12,6 @@ LDFLAGSSTRING +=-X main.GitDate=$(GITDATE)
 LDFLAGSSTRING +=-X main.Version=$(VERSION)
 LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
 
-ALLOCS := e2e/resources/optimism/devnetL1.json
-
 .PHONY: eigenda-proxy
 eigenda-proxy:
 	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) go build -v $(LDFLAGS) -o ./bin/eigenda-proxy ./cmd/server
@@ -30,10 +28,10 @@ clean:
 
 test:
 	go test -v ./...
-	go test -timeout 50m -v ./e2e/ -optimism -deploy-config ${ALLOCS}
+	OPTIMISM=true go test -timeout 50m -v ./e2e/... -deploy-config ../.devnet/devnetL1.json
 
 e2e-test:
-	go test -timeout 50m -v ./e2e/server_test.go -testnet-integration
+	TESTNET=true go test -timeout 50m -v ./e2e/server_test.go -testnet-integration
 
 .PHONY: lint
 lint:

e2e/main_test.go

@@ -1,27 +1,22 @@
 package e2e_test
 
 import (
-	"flag"
 	"os"
 	"testing"
 )
 
 var (
-	optimism                   bool
-	runTestnetIntegrationTests bool
+	runOptimismIntegrationTests bool
+	runTestnetIntegrationTests  bool
 )
 
-func init() {
-	flag.BoolVar(&optimism, "optimism", false, "Run OP Stack integration tests")
-	flag.BoolVar(&runTestnetIntegrationTests, "testnet-integration", false, "Run testnet-based integration tests")
-
+func ParseEnv() {
+	runOptimismIntegrationTests = os.Getenv("OPTIMISM") == "true" || os.Getenv("OPTIMISM") == "1"
+	runTestnetIntegrationTests = os.Getenv("TESTNET") == "true" || os.Getenv("TESTNET") == "1"
 }
 
 func TestMain(m *testing.M) {
-	println("Parsing flags")
-	flag.Parse()
-	println("Flags parsed")
-
+	ParseEnv()
 	code := m.Run()
 	os.Exit(code)
 }

e2e/optimism_test.go

@@ -13,17 +13,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// var (
-// 	runOptimismIntegrationTests bool
-
-// // deployConfig                string
-// )
-
-// func init() {
-// 	flag.BoolVar(&runOptimismIntegrationTests, "optimism", false, "Run OP Stack integration tests")
-// 	// flag.StringVar(&deployConfig, "deploy-config", "", "Path to deploy config")
-// }
-
 var defaultAlloc = &e2eutils.AllocParams{PrefundTestUsers: true}
 
 // L2PlasmaDA is a test harness for manipulating plasma DA state.
@@ -120,15 +109,15 @@ func (a *L2PlasmaDA) ActL1Finalized(t actions.Testing) {
 
 // TestOptimism ... Creates a new SysTestSuite
 func TestOptimism(gt *testing.T) {
-	println("Optimism ", optimism)
-	if !optimism {
+	if !runOptimismIntegrationTests {
 		gt.Skip("Skipping OP Stack integration test")
 	}
 
 	proxyTS, close := CreateTestSuite(gt, true)
 	defer close()
 
 	t := actions.NewDefaultTesting(gt)
+
 	op_stack := NewL2PlasmaDA(t, proxyTS.Address())
 
 	// build L1 block #1

e2e/resources/optimism/addresses.json

@@ -13,17 +13,8 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// var (
-// 	runTestnetIntegrationTests bool
-// )
-
-// func init() {
-// 	flag.BoolVar(&runTestnetIntegrationTests, "testnet-integration", false, "Run testnet-based integration tests")
-
-// }
-
 func TestHoleskyWithPlasmaClient(t *testing.T) {
-	if !runTestnetIntegrationTests {
+	if !runTestnetIntegrationTests || runOptimismIntegrationTests {
 		t.Skip("Skipping testnet integration test")
 	}
 
@@ -51,7 +42,7 @@ func TestHoleskyWithPlasmaClient(t *testing.T) {
 }
 
 func TestHoleskyWithProxyClient(t *testing.T) {
-	if !runTestnetIntegrationTests {
+	if !runTestnetIntegrationTests || runOptimismIntegrationTests {
 		t.Skip("Skipping testnet integration test")
 	}
 
@@ -103,7 +94,7 @@ func TestHoleskyWithProxyClient(t *testing.T) {
 }
 
 func TestMemStoreWithPlasmaClient(t *testing.T) {
-	if runTestnetIntegrationTests {
+	if runTestnetIntegrationTests || runOptimismIntegrationTests {
 		t.Skip("Skipping non-testnet integration test")
 	}
 
@@ -131,7 +122,7 @@ func TestMemStoreWithPlasmaClient(t *testing.T) {
 }
 
 func TestMemStoreWithProxyClient(t *testing.T) {
-	if runTestnetIntegrationTests {
+	if runTestnetIntegrationTests || runOptimismIntegrationTests {
 		t.Skip("Skipping non-testnet integration test")
 	}